aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/opt_constant_propagation.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-07 07:27:49 +0000
committermarha <marha@users.sourceforge.net>2011-02-07 07:27:49 +0000
commit67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9 (patch)
treece4c020cfe90ad231c15af77fb3b0933712f05d7 /mesalib/src/glsl/opt_constant_propagation.cpp
parent5b7cc430132c47f9e4e84fd1830abc6aead39954 (diff)
parent53bf2508fe3d5bd7889ccf4817fcd2bcc531d6ae (diff)
downloadvcxsrv-67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9.tar.gz
vcxsrv-67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9.tar.bz2
vcxsrv-67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/opt_constant_propagation.cpp')
-rw-r--r--mesalib/src/glsl/opt_constant_propagation.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/mesalib/src/glsl/opt_constant_propagation.cpp b/mesalib/src/glsl/opt_constant_propagation.cpp
index 1fff71753..814f6e61f 100644
--- a/mesalib/src/glsl/opt_constant_propagation.cpp
+++ b/mesalib/src/glsl/opt_constant_propagation.cpp
@@ -400,11 +400,8 @@ ir_constant_propagation_visitor::add_constant(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;
if (!ir->write_mask)
return;