diff options
| author | Paul Berry <[email protected]> | 2013-07-27 15:07:08 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-07-30 10:10:25 -0700 |
| commit | 4682b9b7bfffff0caa7bd0f6af3ae820a1df08af (patch) | |
| tree | 37c796fc53cf5dee267d446090e0d6c508e2a04d /src/glsl/linker.h | |
| parent | 4f8048bb5a8558ae4313b12ffd70b593cc629fe8 (diff) | |
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 <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/linker.h')
| -rw-r--r-- | src/glsl/linker.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/linker.h b/src/glsl/linker.h index 2fe2410c220..85a6817d98d 100644 --- a/src/glsl/linker.h +++ b/src/glsl/linker.h @@ -53,7 +53,7 @@ extern bool link_uniform_blocks_are_compatible(const gl_uniform_block *a, const gl_uniform_block *b); -extern int +extern unsigned link_uniform_blocks(void *mem_ctx, struct gl_shader_program *prog, struct gl_shader **shader_list, |