From b76cc897b654dc40954aa4cbe2d73ff53767aede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 13 Nov 2024 12:38:00 +0100 Subject: [PATCH] Cleanu: GPU: Address GLSL warnings --- .../draw/intern/shaders/common_hair_refine_comp.glsl | 2 +- source/blender/draw/intern/shaders/common_math_lib.glsl | 2 +- .../draw/intern/shaders/draw_view_finalize_comp.glsl | 2 +- .../gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl | 9 ++------- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/source/blender/draw/intern/shaders/common_hair_refine_comp.glsl b/source/blender/draw/intern/shaders/common_hair_refine_comp.glsl index b01ff0b616c..42524e55f72 100644 --- a/source/blender/draw/intern/shaders/common_hair_refine_comp.glsl +++ b/source/blender/draw/intern/shaders/common_hair_refine_comp.glsl @@ -10,7 +10,7 @@ COMPUTE_SHADER_CREATE_INFO(draw_hair_refine_compute) void main() { - float interp_time; + float interp_time = 0.0; vec4 data0, data1, data2, data3; hair_get_interp_attrs(data0, data1, data2, data3, interp_time); diff --git a/source/blender/draw/intern/shaders/common_math_lib.glsl b/source/blender/draw/intern/shaders/common_math_lib.glsl index 7fe6437d29a..0154af43693 100644 --- a/source/blender/draw/intern/shaders/common_math_lib.glsl +++ b/source/blender/draw/intern/shaders/common_math_lib.glsl @@ -254,7 +254,7 @@ vec2 safe_normalize_len(vec2 v, out float len) # ifndef GPU_SHADER_MATH_VECTOR_LIB_GLSL vec2 safe_normalize(vec2 v) { - float len; + float len = 0.0; return safe_normalize_len(v, len); } # endif diff --git a/source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl b/source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl index 7b3beecbb3b..1423613037a 100644 --- a/source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl +++ b/source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl @@ -42,7 +42,7 @@ void projmat_dimensions(mat4 winmat, void frustum_boundbox_calc(mat4 winmat, mat4 viewinv, out FrustumCorners frustum_corners) { - float left, right, bottom, top, near, far; + float left = 0.0, right = 0.0, bottom = 0.0, top = 0.0, near = 0.0, far = 0.0; bool is_persp = winmat[3][3] == 0.0; projmat_dimensions(winmat, left, right, bottom, top, near, far); diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl index 7d881081c02..843b181fd77 100644 --- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl @@ -114,10 +114,7 @@ void strip_EmitVertex(const uint strip_index, } } -void geometry_main(VertOut geom_in[4], - uint out_vertex_id, - uint out_primitive_id, - uint out_invocation_id) +void geometry_main(VertOut geom_in[4], uint out_vertex_id, uint out_primitive_id) { const float MiterLimit = 0.75; @@ -330,8 +327,6 @@ void main() uint out_vertex_id = uint(gl_VertexID) % ouput_primitive_vertex_count; uint out_primitive_id = (uint(gl_VertexID) / ouput_primitive_vertex_count) % ouput_primitive_count; - uint out_invocation_id = (uint(gl_VertexID) / output_vertex_count_per_invocation) % - ouput_invocation_count; GreasePencilStrokeData vert_in[4]; vert_in[0] = input_assembly(in_primitive_first_vertex + 0u); @@ -347,5 +342,5 @@ void main() /* Discard by default. */ gl_Position = vec4(NAN_FLT); - geometry_main(vert_out, out_vertex_id, out_primitive_id, out_invocation_id); + geometry_main(vert_out, out_vertex_id, out_primitive_id); }