diff options
| author | Matt Turner <[email protected]> | 2013-08-15 11:05:57 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-08-21 22:47:02 -0700 |
| commit | 1a45db97058d63b742993d0fcf0e5df44e2aa1c6 (patch) | |
| tree | 93ce3506647faa94593467d8f55f6c34bc3323f0 | |
| parent | 9d08756ac7d27b5a392d17c2a91a55cec6edab5d (diff) | |
glsl: Rename ubo_qualifiers_valid to ubo_qualifiers_allowed.
The variable means that UBO qualifiers are allowed in a particular
context (e.g., not allowed in a struct field declaration), rather than a
particular set of UBO qualifiers are valid.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
| -rw-r--r-- | src/glsl/ast.h | 2 | ||||
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 6 | ||||
| -rw-r--r-- | src/glsl/glsl_parser.yy | 2 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/glsl/ast.h b/src/glsl/ast.h index 335374de16b..d227febd71e 100644 --- a/src/glsl/ast.h +++ b/src/glsl/ast.h @@ -644,7 +644,7 @@ public: * Flag indicating that these declarators are in a uniform block, * allowing UBO type qualifiers. */ - bool ubo_qualifiers_valid; + bool ubo_qualifiers_allowed; }; diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index d94faa885b5..06b3a521299 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -1951,7 +1951,7 @@ 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_valid, + bool ubo_qualifiers_allowed, bool is_parameter) { STATIC_ASSERT(sizeof(qual->flags.q) <= sizeof(qual->flags.i)); @@ -2297,7 +2297,7 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual, } if (qual->flags.q.row_major || qual->flags.q.column_major) { - if (!ubo_qualifiers_valid) { + if (!ubo_qualifiers_allowed) { _mesa_glsl_error(loc, state, "uniform block layout qualifiers row_major and " "column_major can only be applied to uniform block " @@ -2852,7 +2852,7 @@ ast_declarator_list::hir(exec_list *instructions, } apply_type_qualifier_to_variable(& this->type->qualifier, var, state, - & loc, this->ubo_qualifiers_valid, false); + & loc, this->ubo_qualifiers_allowed, false); if (this->type->qualifier.flags.q.invariant) { if ((state->target == vertex_shader) && diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index e3a57ea0251..0ed34538bc9 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -2295,7 +2295,7 @@ member_declaration: $$ = new(ctx) ast_declarator_list(type); $$->set_location(yylloc); - $$->ubo_qualifiers_valid = true; + $$->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 a97b3d934c5..6976b09dd18 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -1171,7 +1171,7 @@ ast_declarator_list::ast_declarator_list(ast_fully_specified_type *type) { this->type = type; this->invariant = false; - this->ubo_qualifiers_valid = false; + this->ubo_qualifiers_allowed = false; } void |