From 53bf2508fe3d5bd7889ccf4817fcd2bcc531d6ae Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 7 Feb 2011 07:14:23 +0000 Subject: mesa git update 7 Feb 2011 --- mesalib/src/glsl/opt_copy_propagation.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'mesalib/src/glsl/opt_copy_propagation.cpp') diff --git a/mesalib/src/glsl/opt_copy_propagation.cpp b/mesalib/src/glsl/opt_copy_propagation.cpp index 4ab23bf9b..efa3afda3 100644 --- a/mesalib/src/glsl/opt_copy_propagation.cpp +++ b/mesalib/src/glsl/opt_copy_propagation.cpp @@ -191,7 +191,7 @@ ir_copy_propagation_visitor::visit_enter(ir_call *ir) sig_param_iter.next(); } - /* Since we're unlinked, we don't (necssarily) know the side effects of + /* Since we're unlinked, we don't (necessarily) know the side effects of * this call. So kill all copies. */ acp->make_empty(); @@ -309,11 +309,8 @@ ir_copy_propagation_visitor::add_copy(ir_assignment *ir) { acp_entry *entry; - if (ir->condition) { - ir_constant *condition = ir->condition->as_constant(); - if (!condition || !condition->value.b[0]) - return; - } + if (ir->condition) + return; ir_variable *lhs_var = ir->whole_variable_written(); ir_variable *rhs_var = ir->rhs->whole_variable_referenced(); -- cgit v1.2.3