diff options
Diffstat (limited to 'mesalib/src/glsl/opt_constant_folding.cpp')
| -rw-r--r-- | mesalib/src/glsl/opt_constant_folding.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mesalib/src/glsl/opt_constant_folding.cpp b/mesalib/src/glsl/opt_constant_folding.cpp index 599b21525..dcad59997 100644 --- a/mesalib/src/glsl/opt_constant_folding.cpp +++ b/mesalib/src/glsl/opt_constant_folding.cpp @@ -117,7 +117,8 @@ ir_constant_folding_visitor::visit_enter(ir_assignment *ir) ir_visitor_status ir_constant_folding_visitor::visit_enter(ir_call *ir) { - exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator(); + /* Attempt to constant fold parameters */ + exec_list_iterator sig_iter = ir->callee->parameters.iterator(); foreach_iter(exec_list_iterator, iter, *ir) { ir_rvalue *param_rval = (ir_rvalue *)iter.get(); ir_variable *sig_param = (ir_variable *)sig_iter.get(); @@ -133,6 +134,15 @@ ir_constant_folding_visitor::visit_enter(ir_call *ir) sig_iter.next(); } + /* Next, see if the call can be replaced with an assignment of a constant */ + ir_constant *const_val = ir->constant_expression_value(); + + if (const_val != NULL) { + ir_assignment *assignment = + new(ralloc_parent(ir)) ir_assignment(ir->return_deref, const_val); + ir->replace_with(assignment); + } + return visit_continue_with_parent; } |