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

glsl: fix function inlining with opaque parameters

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Rhys Perry
2018-06-06 20:55:08 +01:00
committed by Marek Olšák
parent f903bce8a6
commit bd56e117ff
1 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/compiler/glsl/opt_function_inlining.cpp
View File

@@ -131,6 +131,18 @@ ir_save_lvalue_visitor::visit_enter(ir_dereference_array *deref)
return visit_stop; return visit_stop;
} }
static bool
should_replace_variable(ir_variable *sig_param, ir_rvalue *param) {
/* For opaque types, we want the inlined variable references
* referencing the passed in variable, since that will have
* the location information, which an assignment of an opaque
* variable wouldn't.
*/
return sig_param->type->contains_opaque() &&
param->is_dereference() &&
sig_param->data.mode == ir_var_function_in;
}
void void
ir_call::generate_inline(ir_instruction *next_ir) ir_call::generate_inline(ir_instruction *next_ir)
{ {
@@ -155,12 +167,8 @@ ir_call::generate_inline(ir_instruction *next_ir)
ir_rvalue *param = (ir_rvalue *) actual_node; ir_rvalue *param = (ir_rvalue *) actual_node;
/* Generate a new variable for the parameter. */ /* Generate a new variable for the parameter. */
if (sig_param->type->contains_opaque()) { if (should_replace_variable(sig_param, param)) {
/* For opaque types, we want the inlined variable references /* Actual replacement happens below */
* referencing the passed in variable, since that will have
* the location information, which an assignment of an opaque
* variable wouldn't. Fix it up below.
*/
parameters[i] = NULL; parameters[i] = NULL;
} else { } else {
parameters[i] = sig_param->clone(ctx, ht); parameters[i] = sig_param->clone(ctx, ht);
@@ -242,10 +250,9 @@ ir_call::generate_inline(ir_instruction *next_ir)
ir_rvalue *const param = (ir_rvalue *) actual_node; ir_rvalue *const param = (ir_rvalue *) actual_node;
ir_variable *sig_param = (ir_variable *) formal_node; ir_variable *sig_param = (ir_variable *) formal_node;
if (sig_param->type->contains_opaque()) { if (should_replace_variable(sig_param, param)) {
ir_dereference *deref = param->as_dereference(); ir_dereference *deref = param->as_dereference();
assert(deref);
do_variable_replacement(&new_instructions, sig_param, deref); do_variable_replacement(&new_instructions, sig_param, deref);
} }
} }
@@ -351,6 +358,9 @@ public:
virtual ir_visitor_status visit_leave(ir_dereference_array *); virtual ir_visitor_status visit_leave(ir_dereference_array *);
virtual ir_visitor_status visit_leave(ir_dereference_record *); virtual ir_visitor_status visit_leave(ir_dereference_record *);
virtual ir_visitor_status visit_leave(ir_texture *); virtual ir_visitor_status visit_leave(ir_texture *);
virtual ir_visitor_status visit_leave(ir_assignment *);
virtual ir_visitor_status visit_leave(ir_expression *);
virtual ir_visitor_status visit_leave(ir_return *);
void replace_deref(ir_dereference **deref); void replace_deref(ir_dereference **deref);
void replace_rvalue(ir_rvalue **rvalue); void replace_rvalue(ir_rvalue **rvalue);
@@ -391,6 +401,32 @@ ir_variable_replacement_visitor::visit_leave(ir_texture *ir)
return visit_continue; return visit_continue;
} }
ir_visitor_status
ir_variable_replacement_visitor::visit_leave(ir_assignment *ir)
{
replace_deref(&ir->lhs);
replace_rvalue(&ir->rhs);
return visit_continue;
}
ir_visitor_status
ir_variable_replacement_visitor::visit_leave(ir_expression *ir)
{
for (uint8_t i = 0; i < ir->num_operands; i++)
replace_rvalue(&ir->operands[i]);
return visit_continue;
}
ir_visitor_status
ir_variable_replacement_visitor::visit_leave(ir_return *ir)
{
replace_rvalue(&ir->value);
return visit_continue;
}
ir_visitor_status ir_visitor_status
ir_variable_replacement_visitor::visit_leave(ir_dereference_array *ir) ir_variable_replacement_visitor::visit_leave(ir_dereference_array *ir)
{ {