From e4e5562d8ad99ef39f430ce0546f4f8775d4824f Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 25 May 2017 18:55:09 +0200 Subject: glsl: teach opt_array_splitting about bindless images Memory/format layout qualifiers shouldn't be lost when arrays of images are splitted by this pass. Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/compiler/glsl/opt_array_splitting.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/compiler/glsl') diff --git a/src/compiler/glsl/opt_array_splitting.cpp b/src/compiler/glsl/opt_array_splitting.cpp index e3073b022ca..fb6d77bd942 100644 --- a/src/compiler/glsl/opt_array_splitting.cpp +++ b/src/compiler/glsl/opt_array_splitting.cpp @@ -449,9 +449,20 @@ optimize_split_arrays(exec_list *instructions, bool linked) for (unsigned int i = 0; i < entry->size; i++) { const char *name = ralloc_asprintf(mem_ctx, "%s_%d", entry->var->name, i); - - entry->components[i] = + ir_variable *new_var = new(entry->mem_ctx) ir_variable(subtype, name, ir_var_temporary); + + /* Do not lose memory/format qualifiers when arrays of images are + * split. + */ + new_var->data.memory_read_only = entry->var->data.memory_read_only; + new_var->data.memory_write_only = entry->var->data.memory_write_only; + new_var->data.memory_coherent = entry->var->data.memory_coherent; + new_var->data.memory_volatile = entry->var->data.memory_volatile; + new_var->data.memory_restrict = entry->var->data.memory_restrict; + new_var->data.image_format = entry->var->data.image_format; + + entry->components[i] = new_var; entry->var->insert_before(entry->components[i]); } -- cgit v1.2.3