aboutsummaryrefslogtreecommitdiffstats
path: root/src/glsl/ast_to_hir.cpp
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2013-08-15 11:05:57 -0700
committerMatt Turner <[email protected]>2013-08-21 22:47:02 -0700
commit1a45db97058d63b742993d0fcf0e5df44e2aa1c6 (patch)
tree93ce3506647faa94593467d8f55f6c34bc3323f0 /src/glsl/ast_to_hir.cpp
parent9d08756ac7d27b5a392d17c2a91a55cec6edab5d (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]>
Diffstat (limited to 'src/glsl/ast_to_hir.cpp')
-rw-r--r--src/glsl/ast_to_hir.cpp6
1 files changed, 3 insertions, 3 deletions
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) &&