Revert "glsl: reject image qualifiers with non-image types inside uniform blocks"
authorMatt Turner <mattst88@gmail.com>
Fri, 28 Apr 2017 19:29:11 +0000 (12:29 -0700)
committerMatt Turner <mattst88@gmail.com>
Fri, 28 Apr 2017 19:31:20 +0000 (12:31 -0700)
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

src/compiler/glsl/ast_to_hir.cpp

index e714f866c447daeceac759670abb0f6fbc3a2bf9..1159b2cdfbf9552617b782781393d9e58cdb97aa 100644 (file)
@@ -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