OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Rename ubo_qualifiers_valid to ubo_qualifiers_allowed.

Browse Source 
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 <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Matt Turner
2013-08-15 11:05:57 -07:00
parent 9d08756ac7
commit 1a45db9705
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/ast.h
View File

@@ -644,7 +644,7 @@ public:
* Flag indicating that these declarators are in a uniform block, * Flag indicating that these declarators are in a uniform block,
* allowing UBO type qualifiers. * allowing UBO type qualifiers.
*/ */
bool ubo_qualifiers_valid; bool ubo_qualifiers_allowed;
}; };

6
src/glsl/ast_to_hir.cpp
View File

@@ -1951,7 +1951,7 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
ir_variable *var, ir_variable *var,
struct _mesa_glsl_parse_state *state, struct _mesa_glsl_parse_state *state,
YYLTYPE *loc, YYLTYPE *loc,
bool ubo_qualifiers_valid, bool ubo_qualifiers_allowed,
bool is_parameter) bool is_parameter)
{ {
STATIC_ASSERT(sizeof(qual->flags.q) <= sizeof(qual->flags.i)); 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 (qual->flags.q.row_major || qual->flags.q.column_major) {
if (!ubo_qualifiers_valid) { if (!ubo_qualifiers_allowed) {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state,
"uniform block layout qualifiers row_major and " "uniform block layout qualifiers row_major and "
"column_major can only be applied to uniform block " "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, 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 (this->type->qualifier.flags.q.invariant) {
if ((state->target == vertex_shader) && if ((state->target == vertex_shader) &&

2
src/glsl/glsl_parser.yy
View File

@@ -2295,7 +2295,7 @@ member_declaration:
$$ = new(ctx) ast_declarator_list(type); $$ = new(ctx) ast_declarator_list(type);
$$->set_location(yylloc); $$->set_location(yylloc);
$$->ubo_qualifiers_valid = true; $$->ubo_qualifiers_allowed = true;
$$->declarations.push_degenerate_list_at_head(& $2->link); $$->declarations.push_degenerate_list_at_head(& $2->link);
} }

2
src/glsl/glsl_parser_extras.cpp
View File

@@ -1171,7 +1171,7 @@ ast_declarator_list::ast_declarator_list(ast_fully_specified_type *type)
{ {
this->type = type; this->type = type;
this->invariant = false; this->invariant = false;
this->ubo_qualifiers_valid = false; this->ubo_qualifiers_allowed = false;
} }
void void