diff options
| author | Samuel Pitoiset <[email protected]> | 2017-05-25 16:26:42 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-01 11:54:06 +0200 |
| commit | ad717102d9db2bc0a0c9d1b1fa6d991f659da04d (patch) | |
| tree | 27cc66b2ec9efe9b2619bb7f199f31f73f083480 /src/compiler/glsl | |
| parent | d9460ad600781b1e4420b9b754a92c0b049e4453 (diff) | |
glsl: handle format layout qualifiers for struct with array of images
This handles a situation like:
struct {
layout (r32f) image2D imgs[6];
} s;
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 65b6262f345..e451bda8016 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -7434,7 +7434,8 @@ ast_process_struct_or_iface_block_members(exec_list *instructions, if (field_type->without_array()->is_image()) { if (qual->flags.q.explicit_image_format) { - if (qual->image_base_type != field_type->sampled_type) { + if (qual->image_base_type != + field_type->without_array()->sampled_type) { _mesa_glsl_error(&loc, state, "format qualifier doesn't " "match the base data type of the image"); } |