From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 1 May 2017 10:34:42 +0000 (+0200)
Subject: glsl: reject format qualifiers with non-image types everywhere
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8003d2516b33fff9a749e62fd994c6cb57b27d4;p=mesa.git

glsl: reject format qualifiers with non-image types everywhere

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 <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

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