OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: handle memory qualifiers for struct with array of images

Browse Source 
This handles a situation like:

struct {
   image2D imgs[6];
} s;

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset
2017-05-25 16:19:58 +02:00
parent e305400443
commit d9460ad600
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -7402,9 +7402,10 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
} }
/* Memory qualifiers are allowed on buffer and image variables, while /* Memory qualifiers are allowed on buffer and image variables, while
* the format qualifier is only accept for images. * the format qualifier is only accepted for images.
*/ */
if (var_mode == ir_var_shader_storage || field_type->is_image()) { if (var_mode == ir_var_shader_storage ||
field_type->without_array()->is_image()) {
/* For readonly and writeonly qualifiers the field definition, /* For readonly and writeonly qualifiers the field definition,
* if set, overwrites the layout qualifier. * if set, overwrites the layout qualifier.
*/ */
@@ -7431,7 +7432,7 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
fields[i].memory_restrict = qual->flags.q.restrict_flag || fields[i].memory_restrict = qual->flags.q.restrict_flag ||
(layout && layout->flags.q.restrict_flag); (layout && layout->flags.q.restrict_flag);
if (field_type->is_image()) { if (field_type->without_array()->is_image()) {
if (qual->flags.q.explicit_image_format) { if (qual->flags.q.explicit_image_format) {
if (qual->image_base_type != field_type->sampled_type) { if (qual->image_base_type != field_type->sampled_type) {
_mesa_glsl_error(&loc, state, "format qualifier doesn't " _mesa_glsl_error(&loc, state, "format qualifier doesn't "