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

glsl: introduce validate_image_qualifier_for_type() helper

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset
2017-04-26 18:50:15 +02:00
parent 80738425e4
commit edb4a1ab2d
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3291,15 +3291,13 @@ apply_explicit_location(const struct ast_type_qualifier *qual,
}
}
static void
apply_image_qualifier_to_variable(const struct ast_type_qualifier *qual,
ir_variable *var,
struct _mesa_glsl_parse_state *state,
YYLTYPE *loc)
static bool
validate_image_qualifier_for_type(struct _mesa_glsl_parse_state *state,
YYLTYPE *loc,
const struct ast_type_qualifier *qual,
const glsl_type *type)
{
const glsl_type *base_type = var->type->without_array();
if (!base_type->is_image()) {
if (!type->is_image()) {
if (qual->flags.q.read_only ||
qual->flags.q.write_only ||
qual->flags.q.coherent ||
@@ -3313,8 +3311,21 @@ apply_image_qualifier_to_variable(const struct ast_type_qualifier *qual,
_mesa_glsl_error(loc, state, "format layout qualifiers may only be "
"applied to images");
}
return;
return false;
}
return true;
}
static void
apply_image_qualifier_to_variable(const struct ast_type_qualifier *qual,
ir_variable *var,
struct _mesa_glsl_parse_state *state,
YYLTYPE *loc)
{
const glsl_type *base_type = var->type->without_array();
if (!validate_image_qualifier_for_type(state, loc, qual, base_type))
return;
if (var->data.mode != ir_var_uniform &&
var->data.mode != ir_var_function_in) {