summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-01-25 13:09:57 -0700
committerBrian Paul <brianp@vmware.com>2011-01-25 13:11:47 -0700
commit9f2bf3d65cf0745a34185c1966d52389fbd1ca90 (patch)
tree4563effa4df6dd91075728ccfc6349f36046e1b2
parent90c2fd86407999475ff6accecf36e5a2c75feb9b (diff)
glsl: silence uninitialized var warning in read_texture()
And generate an error if the texture pattern is not matched.
-rw-r--r--src/glsl/ir_reader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index 0a2f74304d..b78aa051b4 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -876,7 +876,7 @@ ir_reader::read_texture(s_expression *expr)
s_list *s_shadow = NULL;
s_expression *s_lod = NULL;
- ir_texture_opcode op;
+ ir_texture_opcode op = ir_tex; /* silence warning */
s_pattern tex_pattern[] =
{ "tex", s_sampler, s_coord, s_offset, s_proj, s_shadow };
@@ -893,6 +893,9 @@ ir_reader::read_texture(s_expression *expr)
op = ir_texture::get_opcode(tag->value());
if (op == -1)
return NULL;
+ } else {
+ ir_read_error(NULL, "unexpected texture pattern");
+ return NULL;
}
ir_texture *tex = new(mem_ctx) ir_texture(op);