From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 6 Dec 2012 22:57:01 +0000 (-0800)
Subject: glsl: Don't add structure fields to the symbol table
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed3f237e09a42bdb55afb58d1536affad9000d76;p=mesa.git

glsl: Don't add structure fields to the symbol table

I erroneously added this back in January 2011 in commit 88421589.
Looking at the commit message, I have no idea why I added it.  It only
added non-array structure fields to the symbol table, so array structure
fields are treated correctly.

Fixes piglit tests structure-and-field-have-same-name.vert and
structure-and-field-have-same-name-nested.vert.  It should also fix
WebGL conformance tests shader-with-non-reserved-words.

NOTE: This is a candidate for the stable release branches.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57622
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index d8494667bf2..88aae64d424 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -1542,7 +1542,6 @@ struct_declarator:
 	   void *ctx = state;
 	   $$ = new(ctx) ast_declaration($1, false, NULL, NULL);
 	   $$->set_location(yylloc);
-	   state->symbols->add_variable(new(state) ir_variable(NULL, $1, ir_var_auto));
 	}
 	| any_identifier '[' constant_expression ']'
 	{