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

glsl: add name param to validate_flags()

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri
2016-07-30 16:33:26 +10:00
parent 2262fe4081
commit d3dc1b8b5e
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/glsl/ast.h
View File

@@ -755,8 +755,8 @@ struct ast_type_qualifier {
bool validate_flags(YYLTYPE *loc, bool validate_flags(YYLTYPE *loc,
_mesa_glsl_parse_state *state, _mesa_glsl_parse_state *state,
const char *message, const ast_type_qualifier &allowed_flags,
const ast_type_qualifier &allowed_flags); const char *message, const char *name);
ast_subroutine_list *subroutine_list; ast_subroutine_list *subroutine_list;
}; };

7
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -4517,10 +4517,9 @@ ast_declarator_list::hir(exec_list *instructions,
allowed_atomic_qual_mask.flags.q.explicit_offset = 1; allowed_atomic_qual_mask.flags.q.explicit_offset = 1;
allowed_atomic_qual_mask.flags.q.uniform = 1; allowed_atomic_qual_mask.flags.q.uniform = 1;
type->qualifier.validate_flags(&loc, state, type->qualifier.validate_flags(&loc, state, allowed_atomic_qual_mask,
"invalid layout qualifier for " "invalid layout qualifier for",
"atomic_uint", "atomic_uint");
allowed_atomic_qual_mask);
} }
if (this->declarations.is_empty()) { if (this->declarations.is_empty()) {

8
src/compiler/glsl/ast_type.cpp
View File

@@ -600,8 +600,8 @@ ast_type_qualifier::merge_in_qualifier(YYLTYPE *loc,
bool bool
ast_type_qualifier::validate_flags(YYLTYPE *loc, ast_type_qualifier::validate_flags(YYLTYPE *loc,
_mesa_glsl_parse_state *state, _mesa_glsl_parse_state *state,
const char *message, const ast_type_qualifier &allowed_flags,
const ast_type_qualifier &allowed_flags) const char *message, const char *name)
{ {
ast_type_qualifier bad; ast_type_qualifier bad;
bad.flags.i = this->flags.i & ~allowed_flags.flags.i; bad.flags.i = this->flags.i & ~allowed_flags.flags.i;
@@ -609,11 +609,11 @@ ast_type_qualifier::validate_flags(YYLTYPE *loc,
return true; return true;
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state,
"%s:" "%s '%s':"
"%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s" "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
"%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s" "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
"%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", "%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
message, message, name,
bad.flags.q.invariant ? " invariant" : "", bad.flags.q.invariant ? " invariant" : "",
bad.flags.q.precise ? " precise" : "", bad.flags.q.precise ? " precise" : "",
bad.flags.q.constant ? " constant" : "", bad.flags.q.constant ? " constant" : "",