summaryrefslogtreecommitdiffstats
path: root/src/glsl/link_uniform_blocks.cpp
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2013-07-27 15:07:08 -0700
committerPaul Berry <stereotype441@gmail.com>2013-07-30 10:10:25 -0700
commit4682b9b7bfffff0caa7bd0f6af3ae820a1df08af (patch)
tree37c796fc53cf5dee267d446090e0d6c508e2a04d /src/glsl/link_uniform_blocks.cpp
parent4f8048bb5a8558ae4313b12ffd70b593cc629fe8 (diff)
downloadexternal_mesa3d-4682b9b7bfffff0caa7bd0f6af3ae820a1df08af.zip
external_mesa3d-4682b9b7bfffff0caa7bd0f6af3ae820a1df08af.tar.gz
external_mesa3d-4682b9b7bfffff0caa7bd0f6af3ae820a1df08af.tar.bz2
glsl: Remove bogus check on return value of link_uniform_blocks().
A comment in link_intrastage_shaders(), and an if-test that followed it, seemed to indicate that link_uniform_blocks() would return a negative value in the event of an error. But this is not the case--all error checking has already been performed by validate_intrastage_interface_blocks(), and link_uniform_blocks() can only return unsigned values. So get rid of the if-test and change the return type of link_intrastage_shaders() to clarify that it can only return unsigned values. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/link_uniform_blocks.cpp')
-rw-r--r--src/glsl/link_uniform_blocks.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/link_uniform_blocks.cpp b/src/glsl/link_uniform_blocks.cpp
index c72d1d8..1083653 100644
--- a/src/glsl/link_uniform_blocks.cpp
+++ b/src/glsl/link_uniform_blocks.cpp
@@ -137,7 +137,7 @@ struct block {
bool has_instance_name;
};
-int
+unsigned
link_uniform_blocks(void *mem_ctx,
struct gl_shader_program *prog,
struct gl_shader **shader_list,