gallivm: fetch immediates to correct type (v2)

[mesa.git] / src / glsl / opt_constant_variable.cpp

diff --git a/src/glsl/opt_constant_variable.cpp b/src/glsl/opt_constant_variable.cpp
index 1fb73e765e1c842692d2b500d61bb01100a737dc..3fa7c3badc804c4ae5aa6d55d67876bffb18fc1d 100644 (file)
--- a/src/glsl/opt_constant_variable.cpp
+++ b/src/glsl/opt_constant_variable.cpp
@@ -22,7 +22,7 @@
  */
 
 /**
- * \file ir_constant_variable.cpp
+ * \file opt_constant_variable.cpp
  *
  * Marks variables assigned a single constant value over the course
  * of the program as constant.
@@ -104,11 +104,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)