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

glsl: Copy function out to temp if we don't directly ref a variable

Browse Source 
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 <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri
2018-04-09 14:40:40 +10:00
committed by Matt Turner
parent 63f6d7afd6
commit 76c27e47b9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/glsl/ast_function.cpp
View File

@@ -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. * nothing needs to be done to fix the parameter.
*/ */
if (formal_type == actual->type 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; return;
/* An array index could also be an out variable so we need to make a copy /* 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 = ir_dereference_variable *const deref_tmp_1 =
new(mem_ctx) ir_dereference_variable(tmp); new(mem_ctx) ir_dereference_variable(tmp);
ir_assignment *const assignment = 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); before_instructions->push_tail(assignment);
} }