Module: Mesa
Branch: master
Commit: ed3f237e09a42bdb55afb58d1536affad9000d76
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed3f237e09a42bdb55afb58d1536affad9000d76

Author: Ian Romanick <[email protected]>
Date:   Thu Dec  6 14:57:01 2012 -0800

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 <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57622
Reviewed-by: Kenneth Graunke <[email protected]>

---

 src/glsl/glsl_parser.yy |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index d849466..88aae64 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 ']'
        {

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to