From f8003d2516b33fff9a749e62fd994c6cb57b27d4 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 1 May 2017 12:34:42 +0200 Subject: [PATCH] glsl: reject format qualifiers with non-image types everywhere MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Including structures, interfaces and uniform blocks. Fixes the following ARB_shader_image_load_store test: format-layout-with-non-image-type.frag Signed-off-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle --- src/compiler/glsl/ast_to_hir.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 558cafb7084..e5604a10acd 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -6894,6 +6894,8 @@ ast_process_struct_or_iface_block_members(exec_list *instructions, "to struct or interface block members"); } + 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: * * "A block member may be declared with a stream identifier, but -- 2.30.2