This relaxes using memory qualifiers for buffer variables because they are allowed.
Fixes the following ARB_shader_image_load_store test: memory-qualifier-with-non-image-type.frag Signed-off-by: Samuel Pitoiset <[email protected]> --- src/compiler/glsl/ast_to_hir.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index a3f8a5a8c9..20a0f11755 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -3297,14 +3297,21 @@ validate_memory_qualifier_for_type(struct _mesa_glsl_parse_state *state, const struct ast_type_qualifier *qual, const glsl_type *type) { - if (!type->is_image()) { + /* From Section 4.10 (Memory Qualifiers) of the GLSL 4.50 spec: + * + * "Memory qualifiers are only supported in the declarations of image + * variables, buffer variables, and shader storage blocks; it is an error + * to use such qualifiers in any other declarations. + */ + if (!type->is_image() && !qual->flags.q.buffer) { if (qual->flags.q.read_only || qual->flags.q.write_only || qual->flags.q.coherent || qual->flags.q._volatile || qual->flags.q.restrict_flag) { _mesa_glsl_error(loc, state, "memory qualifiers may only be applied " - "to images"); + "in the declarations of image variables, buffer " + "variables, and shader storage blocks"); return false; } } @@ -6893,6 +6900,7 @@ ast_process_struct_or_iface_block_members(exec_list *instructions, "to struct or interface block members"); } + validate_memory_qualifier_for_type(state, &loc, qual, decl_type); validate_image_format_qualifier_for_type(state, &loc, qual, decl_type); /* From Section 4.4.2.3 (Geometry Outputs) of the GLSL 4.50 spec: -- 2.12.2 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
