summaryrefslogtreecommitdiffstats
path: root/src/glsl/glsl_parser.yy
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-04-26 18:19:39 -0700
committerEric Anholt <[email protected]>2012-07-20 10:43:12 -0700
commitf7561e8ecd80e915150ca63c0c79a5f9839c8e12 (patch)
tree76d52d4b5a5b69a0b8d3ac06f3bdd79ff302400a /src/glsl/glsl_parser.yy
parentcdad337fec39d788a4b04de080a51d0ea1325e10 (diff)
glsl: Turn UBO variable declarations into ir_variables and check qualifiers.
Fixes piglit layout-*-non-uniform and layout-*-within-block. Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
-rw-r--r--src/glsl/glsl_parser.yy2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 3373375911b..b2533c8476f 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -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);
}