summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-12-11 16:51:02 -0800
committerIan Romanick <[email protected]>2013-01-18 17:35:33 -0800
commitf26520146b6763212aca5c4f1f14a32f2824bbb0 (patch)
treeba3c69e1684ac6b412bd3a243d567795747306a6 /src/glsl
parentbd85c75922c5f82159e11b3e19ff95d82c35a21f (diff)
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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/link_uniforms.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index aa8a8b3fbd8..07d9c18dea0 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