diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-07 07:27:49 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-07 07:27:49 +0000 |
| commit | 67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9 (patch) | |
| tree | ce4c020cfe90ad231c15af77fb3b0933712f05d7 /mesalib/src/glsl/opt_copy_propagation.cpp | |
| parent | 5b7cc430132c47f9e4e84fd1830abc6aead39954 (diff) | |
| parent | 53bf2508fe3d5bd7889ccf4817fcd2bcc531d6ae (diff) | |
| download | vcxsrv-67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9.tar.gz vcxsrv-67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9.tar.bz2 vcxsrv-67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/opt_copy_propagation.cpp')
| -rw-r--r-- | mesalib/src/glsl/opt_copy_propagation.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
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(); |