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

glsl: Apply memory qualifiers to vars inside named block interfaces

Browse Source 
This is missing and memory qualifiers are currently being ignored for SSBOs.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Eduardo Lima Mitev
2016-05-05 13:52:37 +02:00
parent f75a26d1ba
commit 7f7f58f17f
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6963,6 +6963,16 @@ is_unsized_array_last_element(ir_variable *v)
return false; return false;
} }
static void
apply_memory_qualifiers(ir_variable *var, glsl_struct_field field)
{
var->data.image_read_only = field.image_read_only;
var->data.image_write_only = field.image_write_only;
var->data.image_coherent = field.image_coherent;
var->data.image_volatile = field.image_volatile;
var->data.image_restrict = field.image_restrict;
}
ir_rvalue * ir_rvalue *
ast_interface_block::hir(exec_list *instructions, ast_interface_block::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
@@ -7449,6 +7459,9 @@ ast_interface_block::hir(exec_list *instructions,
} }
} }
} }
if (var->data.mode == ir_var_shader_storage)
apply_memory_qualifiers(var, fields[i]);
} }
if (ir_variable *earlier = if (ir_variable *earlier =
@@ -7523,13 +7536,8 @@ ast_interface_block::hir(exec_list *instructions,
var->data.matrix_layout = fields[i].matrix_layout; var->data.matrix_layout = fields[i].matrix_layout;
} }
if (var->data.mode == ir_var_shader_storage) { if (var->data.mode == ir_var_shader_storage)
var->data.image_read_only = fields[i].image_read_only; apply_memory_qualifiers(var, fields[i]);
var->data.image_write_only = fields[i].image_write_only;
var->data.image_coherent = fields[i].image_coherent;
var->data.image_volatile = fields[i].image_volatile;
var->data.image_restrict = fields[i].image_restrict;
}
/* Examine var name here since var may get deleted in the next call */ /* Examine var name here since var may get deleted in the next call */
bool var_is_gl_id = is_gl_identifier(var->name); bool var_is_gl_id = is_gl_identifier(var->name);