summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/ast_to_hir.cpp
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-05-01 12:34:41 +0200
committerSamuel Pitoiset <[email protected]>2017-05-04 14:01:47 +0200
commit9efea874b9958a54e51c7fc25bd7564623b6126b (patch)
treea6e4696f6de2f601684aa60297414ecd9e8ab58a /src/compiler/glsl/ast_to_hir.cpp
parenta5f82db3805ff8e96b04e5b35fc566eac2f0a0a8 (diff)
glsl: rework validate_image_qualifier_for_type()
It makes more sense to have two separate validate functions, mainly because memory qualifiers are allowed with members of shader storage blocks. validate_memory_qualifier_for_type() will be fixed in a separate patch. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/compiler/glsl/ast_to_hir.cpp')
-rw-r--r--src/compiler/glsl/ast_to_hir.cpp36
1 files changed, 27 insertions, 9 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index b57d1cf53b5..558cafb7084 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -3293,10 +3293,10 @@ apply_explicit_location(const struct ast_type_qualifier *qual,
}
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)
+validate_memory_qualifier_for_type(struct _mesa_glsl_parse_state *state,
+ YYLTYPE *loc,
+ const struct ast_type_qualifier *qual,
+ const glsl_type *type)
{
if (!type->is_image()) {
if (qual->flags.q.read_only ||
@@ -3306,12 +3306,26 @@ validate_image_qualifier_for_type(struct _mesa_glsl_parse_state *state,
qual->flags.q.restrict_flag) {
_mesa_glsl_error(loc, state, "memory qualifiers may only be applied "
"to images");
+ return false;
}
+ }
+ return true;
+}
- if (qual->flags.q.explicit_image_format) {
- _mesa_glsl_error(loc, state, "format layout qualifiers may only be "
- "applied to images");
- }
+static bool
+validate_image_format_qualifier_for_type(struct _mesa_glsl_parse_state *state,
+ YYLTYPE *loc,
+ const struct ast_type_qualifier *qual,
+ const glsl_type *type)
+{
+ /* From section 4.4.6.2 (Format Layout Qualifiers) of the GLSL 4.50 spec:
+ *
+ * "Format layout qualifiers can be used on image variable declarations
+ * (those declared with a basic type having “image ” in its keyword)."
+ */
+ if (!type->is_image() && qual->flags.q.explicit_image_format) {
+ _mesa_glsl_error(loc, state, "format layout qualifiers may only be "
+ "applied to images");
return false;
}
return true;
@@ -3325,7 +3339,11 @@ apply_image_qualifier_to_variable(const struct ast_type_qualifier *qual,
{
const glsl_type *base_type = var->type->without_array();
- if (!validate_image_qualifier_for_type(state, loc, qual, base_type))
+ if (!validate_image_format_qualifier_for_type(state, loc, qual, base_type) ||
+ !validate_memory_qualifier_for_type(state, loc, qual, base_type))
+ return;
+
+ if (!base_type->is_image())
return;
if (var->data.mode != ir_var_uniform &&