diff options
| author | Samuel Pitoiset <[email protected]> | 2017-04-26 18:50:16 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-04-28 10:43:53 +0200 |
| commit | 24011ead71ea9980e6b34e40d9dbd64e6560f5a4 (patch) | |
| tree | 461172d8673bd922ece5661018ec4da0c3447a27 | |
| parent | edb4a1ab2d3fbbbe0ec88f3fbb0654620b4b094c (diff) | |
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 <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 1159b2cdfbf..e714f866c44 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 |