[Mesa-dev] [PATCH] glsl: Don't add structure fields to the symbol table

Ian Romanick idr at freedesktop.org
Thu Dec 6 14:57:01 PST 2012

From: Ian Romanick <ian.d.romanick at intel.com>

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 at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57622
Cc: Pavel Ondračka <pavel.ondracka at email.cz>
 src/glsl/glsl_parser.yy | 1 -
 1 file changed, 1 deletion(-)

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

More information about the mesa-dev mailing list