From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 26 Apr 2017 16:50:16 +0000 (+0200)
Subject: glsl: reject image qualifiers with non-image types inside uniform blocks
X-Git-Tag: upstream/18.1.0~10423
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24011ead71ea9980e6b34e40d9dbd64e6560f5a4;p=platform%2Fupstream%2Fmesa.git

glsl: reject image qualifiers with non-image types inside uniform blocks

Fixes the following ARB_shader_image_load_store tests:

format-layout-with-non-image-type.frag
memory-qualifier-with-non-image-type.frag

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 1159b2c..e714f86 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -6875,6 +6875,8 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
                           "to struct or interface block members");
       }
 
+      validate_image_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