From f26520146b6763212aca5c4f1f14a32f2824bbb0 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 11 Dec 2012 16:51:02 -0800 Subject: [PATCH] glsl: Eliminate link_update_uniform_buffer_variables return value It always returns true, so there's no point in having a return value. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/glsl/link_uniforms.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp index aa8a8b3..07d9c18 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/glsl/link_uniforms.cpp @@ -452,7 +452,7 @@ link_cross_validate_uniform_block(void *mem_ctx, * would point at the uniform block list in one of the pre-linked * shaders). */ -static bool +static void link_update_uniform_buffer_variables(struct gl_shader *shader) { foreach_list(node, shader->ir) { @@ -478,8 +478,6 @@ link_update_uniform_buffer_variables(struct gl_shader *shader) } assert(found); } - - return true; } void @@ -544,8 +542,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog) if (prog->_LinkedShaders[i] == NULL) continue; - if (!link_update_uniform_buffer_variables(prog->_LinkedShaders[i])) - return; + link_update_uniform_buffer_variables(prog->_LinkedShaders[i]); } /* First pass: Count the uniform resources used by the user-defined -- 2.7.4