fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: reject image qualifiers with non-image types inside uniform blocks

Browse source 
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 <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset 2017-04-26 18:50:16 +02:00
parent edb4a1ab2d
commit 24011ead71
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/glsl/ast_to_hir.cpp
View file

@ -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