Module: Mesa
Branch: master
Commit: ee70937d1513b616a63175d84507f308759a129d
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee70937d1513b616a63175d84507f308759a129d

Author: Matt Turner <[email protected]>
Date:   Fri Apr 28 12:29:11 2017 -0700

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

---

 src/compiler/glsl/ast_to_hir.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index e714f866c4..1159b2cdfb 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

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to