fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 15:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: silence uninitialized var warning in read_texture()

Browse source 
And generate an error if the texture pattern is not matched.
This commit is contained in:
Brian Paul 2011-01-25 13:09:57 -07:00
parent 90c2fd8640
commit 9f2bf3d65c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/glsl/ir_reader.cpp
View file

@ -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);