From f2c1d7acd0ca56a020a982425523ec8f7fade966 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 9 Apr 2018 14:40:40 +1000 Subject: [PATCH] glsl: Copy function out to temp if we don't directly ref a variable Otherwise we can end up with IR that looks like this: ( (declare (temporary ) vec4 f@8) (assign (xyzw) (var_ref f@8) (var_ref f) ) (call f16 ((swiz y (var_ref f@8) ))) (assign (xyzw) (var_ref f) (var_ref f@8) ) )) When we really need: (declare (temporary ) float inout_tmp) (assign (x) (var_ref inout_tmp) (swiz y (var_ref f) )) (call f16 ((var_ref inout_tmp) )) (assign (y) (var_ref f) (swiz y (swiz xxxx (var_ref inout_tmp) ))) (declare (temporary ) void void_var) The GLSL IR function inlining code seemed to produce correct code even without this but we need the correct IR for GLSL IR -> NIR to be able to understand whats going on. Reviewed-by: Kenneth Graunke (cherry picked from commit 76c27e47b90647df047e785d6b3ab5d0d979a1ee) Nominated-by: Matt Turner --- src/compiler/glsl/ast_function.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp index 1fa3f7561ae..bdf355e5119 100644 --- a/src/compiler/glsl/ast_function.cpp +++ b/src/compiler/glsl/ast_function.cpp @@ -402,7 +402,8 @@ fix_parameter(void *mem_ctx, ir_rvalue *actual, const glsl_type *formal_type, * nothing needs to be done to fix the parameter. */ if (formal_type == actual->type - && (expr == NULL || expr->operation != ir_binop_vector_extract)) + && (expr == NULL || expr->operation != ir_binop_vector_extract) + && actual->as_dereference_variable()) return; /* An array index could also be an out variable so we need to make a copy @@ -456,7 +457,7 @@ fix_parameter(void *mem_ctx, ir_rvalue *actual, const glsl_type *formal_type, ir_dereference_variable *const deref_tmp_1 = new(mem_ctx) ir_dereference_variable(tmp); ir_assignment *const assignment = - new(mem_ctx) ir_assignment(deref_tmp_1, actual); + new(mem_ctx) ir_assignment(deref_tmp_1, actual->clone(mem_ctx, NULL)); before_instructions->push_tail(assignment); } -- 2.11.0