Browse Source

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: 76c27e47b9 ("glsl: Copy function out to temp if we don't directly ref a variable")

Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
tags/19.0-branchpoint
Danylo Piliaiev 6 years ago
parent
commit
0862929bf6
1 changed files with 22 additions and 24 deletions
  1. 22
    24
      src/compiler/glsl/ast_function.cpp

+ 22
- 24
src/compiler/glsl/ast_function.cpp View File

@@ -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;

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);

/* 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;
}
/* 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_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;
}
}


Loading…
Cancel
Save