diff options
| -rw-r--r-- | src/glsl/ast.h | 6 | ||||
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 5 | ||||
| -rw-r--r-- | src/glsl/glsl_parser.yy | 1 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/src/glsl/ast.h b/src/glsl/ast.h index d227febd71e..1c7fc63ac24 100644 --- a/src/glsl/ast.h +++ b/src/glsl/ast.h @@ -639,12 +639,6 @@ public: * is used to note these cases when no type is specified. */ int invariant; - - /** - * Flag indicating that these declarators are in a uniform block, - * allowing UBO type qualifiers. - */ - bool ubo_qualifiers_allowed; }; diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index ac86c4242ac..335df11e3a6 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -1951,7 +1951,6 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual, ir_variable *var, struct _mesa_glsl_parse_state *state, YYLTYPE *loc, - bool ubo_qualifiers_allowed, bool is_parameter) { STATIC_ASSERT(sizeof(qual->flags.q) <= sizeof(qual->flags.i)); @@ -2846,7 +2845,7 @@ ast_declarator_list::hir(exec_list *instructions, } apply_type_qualifier_to_variable(& this->type->qualifier, var, state, - & loc, this->ubo_qualifiers_allowed, false); + & loc, false); if (this->type->qualifier.flags.q.invariant) { if ((state->target == vertex_shader) && @@ -3356,7 +3355,7 @@ ast_parameter_declarator::hir(exec_list *instructions, * for function parameters the default mode is 'in'. */ apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc, - false, true); + true); /* From page 17 (page 23 of the PDF) of the GLSL 1.20 spec: * diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 0ed34538bc9..d8e589d4991 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -2295,7 +2295,6 @@ member_declaration: $$ = new(ctx) ast_declarator_list(type); $$->set_location(yylloc); - $$->ubo_qualifiers_allowed = true; $$->declarations.push_degenerate_list_at_head(& $2->link); } diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 6976b09dd18..8669b77629b 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -1171,7 +1171,6 @@ ast_declarator_list::ast_declarator_list(ast_fully_specified_type *type) { this->type = type; this->invariant = false; - this->ubo_qualifiers_allowed = false; } void |