summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2014-03-05 16:39:59 -0700
committerBrian Paul <[email protected]>2014-03-06 07:45:36 -0700
commitef8a19ed4facf9769e1da1cbb9e741df23893ed5 (patch)
treeaf8692cfec0d144db2cf0db168cd8b8294dfd003
parent3649800009bffc7787f08c32cfee355b8e874b20 (diff)
glsl: fix compiler warnings in link_uniforms.cpp
With a non-debug build, gcc has two complaints: 1. 'found' var not used. Silence with '(void) found;' 2. 'id' not initialized. It's assigned by the UniformHash->get() call, actually. But init it to zero to silence gcc. Reviewed-by: Matt Turner <[email protected]>
-rw-r--r--src/glsl/link_uniforms.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 1cf376d5d29..1c451e7f51c 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -775,9 +775,10 @@ link_set_image_access_qualifiers(struct gl_shader_program *prog)
if (var && var->data.mode == ir_var_uniform &&
var->type->contains_image()) {
- unsigned id;
+ unsigned id = 0;
bool found = prog->UniformHash->get(id, var->name);
assert(found);
+ (void) found;
const gl_uniform_storage *storage = &prog->UniformStorage[id];
const unsigned index = storage->image[i].index;
const GLenum access = (var->data.image.read_only ? GL_READ_ONLY :