From 871aea89fd334203c331e7a086738ec59458e1d9 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Thu, 10 Jan 2019 18:16:59 +0200 Subject: [PATCH] glsl: Fix copying function's out to temp if dereferenced by array Function's out variable could be an array dereferenced by an array: func(v[w[i]]); or something more complicated. Copy index in any case. Fixes: 76c27e47b906 ("glsl: Copy function out to temp if we don't directly ref a variable") Signed-off-by: Danylo Piliaiev Reviewed-by: Timothy Arceri Reviewed-by: Matt Turner Reviewed-by: Kenneth Graunke (cherry picked from commit 0862929bf64222e85e8242824aecf05e494c157c) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109488 Nominated-by: Matt Turner --- src/compiler/glsl/ast_function.cpp | 40 ++++++++++++++---------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp index bdf355e5119..4aff263375c 100644 --- a/src/compiler/glsl/ast_function.cpp +++ b/src/compiler/glsl/ast_function.cpp @@ -363,31 +363,29 @@ copy_index_derefs_to_temps(ir_instruction *ir, void *data) ir = a->array->as_dereference(); ir_rvalue *idx = a->array_index; - if (idx->as_dereference_variable()) { - ir_variable *var = idx->variable_referenced(); + ir_variable *var = idx->variable_referenced(); - /* If the index is read only it cannot change so there is no need - * to copy it. - */ - if (var->data.read_only || var->data.memory_read_only) - return; + /* If the index is read only it cannot change so there is no need + * to copy it. + */ + if (!var || var->data.read_only || var->data.memory_read_only) + return; - ir_variable *tmp = new(d->mem_ctx) ir_variable(idx->type, "idx_tmp", - ir_var_temporary); - d->before_instructions->push_tail(tmp); + ir_variable *tmp = new(d->mem_ctx) ir_variable(idx->type, "idx_tmp", + ir_var_temporary); + d->before_instructions->push_tail(tmp); - ir_dereference_variable *const deref_tmp_1 = - new(d->mem_ctx) ir_dereference_variable(tmp); - ir_assignment *const assignment = - new(d->mem_ctx) ir_assignment(deref_tmp_1, - idx->clone(d->mem_ctx, NULL)); - d->before_instructions->push_tail(assignment); + ir_dereference_variable *const deref_tmp_1 = + new(d->mem_ctx) ir_dereference_variable(tmp); + ir_assignment *const assignment = + new(d->mem_ctx) ir_assignment(deref_tmp_1, + idx->clone(d->mem_ctx, NULL)); + d->before_instructions->push_tail(assignment); - /* Replace the array index with a dereference of the new temporary */ - ir_dereference_variable *const deref_tmp_2 = - new(d->mem_ctx) ir_dereference_variable(tmp); - a->array_index = deref_tmp_2; - } + /* Replace the array index with a dereference of the new temporary */ + ir_dereference_variable *const deref_tmp_2 = + new(d->mem_ctx) ir_dereference_variable(tmp); + a->array_index = deref_tmp_2; } }