From: Matt Turner <mattst88@gmail.com>
Date: Fri, 28 Apr 2017 19:29:11 +0000 (-0700)
Subject: Revert "glsl: reject image qualifiers with non-image types inside uniform blocks"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ee70937d1513b616a63175d84507f308759a129d;p=mesa.git

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

This reverts commit 24011ead71ea9980e6b34e40d9dbd64e6560f5a4.

This causes lots of ES 3.1 CTS tests to fail to compile a bit of code
like:

   layout(binding = 0) buffer InOut
   {
        highp uint inputValues[384];
        highp uint outputValues[384];
        coherent highp uint groupValues[64];      <-----
   } sb_inout;

   error: memory qualifiers may only be applied to images
---

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index e714f866c44..1159b2cdfbf 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -6875,8 +6875,6 @@ 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