diff options
| author | Samuel Pitoiset <[email protected]> | 2017-05-01 12:34:42 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-05-04 14:01:56 +0200 |
| commit | f8003d2516b33fff9a749e62fd994c6cb57b27d4 (patch) | |
| tree | 9ecec8a3f3425571556d47bea3657e7f15320564 | |
| parent | 9efea874b9958a54e51c7fc25bd7564623b6126b (diff) | |
glsl: reject format qualifiers with non-image types everywhere
Including structures, interfaces and uniform blocks.
Fixes the following ARB_shader_image_load_store test:
format-layout-with-non-image-type.frag
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Nicolai Hähnle <[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 558cafb7084..e5604a10acd 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -6894,6 +6894,8 @@ ast_process_struct_or_iface_block_members(exec_list *instructions, "to struct or interface block members"); } + validate_image_format_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 |