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_constant_variable.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_constant_variable.cpp')
| -rw-r--r-- | mesalib/src/glsl/opt_constant_variable.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mesalib/src/glsl/opt_constant_variable.cpp b/mesalib/src/glsl/opt_constant_variable.cpp index 1f51da6e4..9dca0ff8e 100644 --- a/mesalib/src/glsl/opt_constant_variable.cpp +++ b/mesalib/src/glsl/opt_constant_variable.cpp @@ -107,11 +107,8 @@ ir_constant_variable_visitor::visit_enter(ir_assignment *ir) /* OK, now find if we actually have all the right conditions for * this to be a constant value assigned to the var. */ - if (ir->condition) { - constval = ir->condition->constant_expression_value(); - if (!constval || !constval->value.b[0]) - return visit_continue; - } + if (ir->condition) + return visit_continue; ir_variable *var = ir->whole_variable_written(); if (!var) |