summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2017-04-28 12:29:11 -0700
committerMatt Turner <[email protected]>2017-04-28 12:31:20 -0700
commitee70937d1513b616a63175d84507f308759a129d (patch)
tree53ef27dbba6f6605879a9ad1e0f6ccb0e57a0f0e
parent27469aa72eb301e7c91f237719077372292e3704 (diff)
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
-rw-r--r--src/compiler/glsl/ast_to_hir.cpp2
1 files changed, 0 insertions, 2 deletions
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