diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-31 10:00:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-31 10:00:43 +0200 |
| commit | bd27b3d008b0abf9ae2edcb127302728808533e4 (patch) | |
| tree | a73a74f04a31a0f44465ed82bcf58b180ca53dbd /mesalib/src/glsl/glsl_parser.yy | |
| parent | 2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (diff) | |
| download | vcxsrv-bd27b3d008b0abf9ae2edcb127302728808533e4.tar.gz vcxsrv-bd27b3d008b0abf9ae2edcb127302728808533e4.tar.bz2 vcxsrv-bd27b3d008b0abf9ae2edcb127302728808533e4.zip | |
fontconfig libXext mesa xserver pixman git update 31 Jul 2012
Diffstat (limited to 'mesalib/src/glsl/glsl_parser.yy')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser.yy | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy index 337337591..f61d6b8dd 100644 --- a/mesalib/src/glsl/glsl_parser.yy +++ b/mesalib/src/glsl/glsl_parser.yy @@ -301,7 +301,7 @@ pragma_statement: | PRAGMA_OPTIMIZE_OFF EOL | PRAGMA_INVARIANT_ALL EOL { - if (state->language_version < 120) { + if (state->language_version < 120 && !state->Const.GLSL_100ES) { _mesa_glsl_warning(& @1, state, "pragma `invariant(all)' not supported in %s", state->version_string); @@ -1967,6 +1967,7 @@ member_declaration: type->specifier = $3; $$ = new(ctx) ast_declarator_list(type); $$->set_location(yylloc); + $$->ubo_qualifiers_valid = true; $$->declarations.push_degenerate_list_at_head(& $4->link); } @@ -1980,6 +1981,7 @@ member_declaration: type->specifier = $2; $$ = new(ctx) ast_declarator_list(type); $$->set_location(yylloc); + $$->ubo_qualifiers_valid = true; $$->declarations.push_degenerate_list_at_head(& $3->link); } |