X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2Fir_constant_expression.cpp;h=4fd6d09a3afbf6dc7191a4bc106c984481d8d69e;hb=b2ddb93ff3b8c88682634ccdef247967e31fab84;hp=541398a91c7afd346c69700e1d60d365836a59e6;hpb=ca088cc277ce9f986693c857f3961dc0e1a4d91c;p=mesa.git

diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 541398a91c7..4fd6d09a3af 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -34,110 +34,38 @@
  */
 
 #include <math.h>
+#include "main/core.h" /* for MAX2, MIN2, CLAMP */
 #include "ir.h"
 #include "ir_visitor.h"
 #include "glsl_types.h"
 
-/**
- * Visitor class for evaluating constant expressions
- */
-class ir_constant_visitor : public ir_visitor {
-public:
-   ir_constant_visitor()
-      : value(NULL)
-   {
-      /* empty */
-   }
-
-   virtual ~ir_constant_visitor()
-   {
-      /* empty */
-   }
-
-   /**
-    * \name Visit methods
-    *
-    * As typical for the visitor pattern, there must be one \c visit method for
-    * each concrete subclass of \c ir_instruction.  Virtual base classes within
-    * the hierarchy should not have \c visit methods.
-    */
-   /*@{*/
-   virtual void visit(ir_variable *);
-   virtual void visit(ir_function_signature *);
-   virtual void visit(ir_function *);
-   virtual void visit(ir_expression *);
-   virtual void visit(ir_texture *);
-   virtual void visit(ir_swizzle *);
-   virtual void visit(ir_dereference_variable *);
-   virtual void visit(ir_dereference_array *);
-   virtual void visit(ir_dereference_record *);
-   virtual void visit(ir_assignment *);
-   virtual void visit(ir_constant *);
-   virtual void visit(ir_call *);
-   virtual void visit(ir_return *);
-   virtual void visit(ir_discard *);
-   virtual void visit(ir_if *);
-   virtual void visit(ir_loop *);
-   virtual void visit(ir_loop_jump *);
-   /*@}*/
-
-   /**
-    * Value of the constant expression.
-    *
-    * \note
-    * This field will be \c NULL if the expression is not constant valued.
-    */
-   /* FINIHSME: This cannot hold values for constant arrays or structures. */
-   ir_constant *value;
-};
-
-
-ir_constant *
-ir_instruction::constant_expression_value()
-{
-   ir_constant_visitor visitor;
-
-   this->accept(& visitor);
-   return visitor.value;
-}
-
-
-void
-ir_constant_visitor::visit(ir_variable *ir)
+static float
+dot(ir_constant *op0, ir_constant *op1)
 {
-   (void) ir;
-   value = NULL;
-}
+   assert(op0->type->is_float() && op1->type->is_float());
 
+   float result = 0;
+   for (unsigned c = 0; c < op0->type->components(); c++)
+      result += op0->value.f[c] * op1->value.f[c];
 
-void
-ir_constant_visitor::visit(ir_function_signature *ir)
-{
-   (void) ir;
-   value = NULL;
+   return result;
 }
 
-
-void
-ir_constant_visitor::visit(ir_function *ir)
+ir_constant *
+ir_expression::constant_expression_value()
 {
-   (void) ir;
-   value = NULL;
-}
+   if (this->type->is_error())
+      return NULL;
 
-void
-ir_constant_visitor::visit(ir_expression *ir)
-{
-   value = NULL;
-   ir_constant *op[2] = { NULL, NULL };
+   ir_constant *op[Elements(this->operands)] = { NULL, };
    ir_constant_data data;
 
    memset(&data, 0, sizeof(data));
 
-   for (unsigned operand = 0; operand < ir->get_num_operands(); operand++) {
-      op[operand] = ir->operands[operand]->constant_expression_value();
+   for (unsigned operand = 0; operand < this->get_num_operands(); operand++) {
+      op[operand] = this->operands[operand]->constant_expression_value();
       if (!op[operand])
-	 return;
+	 return NULL;
    }
 
    if (op[1] != NULL)
@@ -149,61 +77,129 @@ ir_constant_visitor::visit(ir_expression *ir)
    /* When iterating over a vector or matrix's components, we want to increase
     * the loop counter.  However, for scalars, we want to stay at 0.
     */
-   unsigned c0_inc = op0_scalar ? 1 : 0;
-   unsigned c1_inc = op1_scalar ? 1 : 0;
-   unsigned components = op[op1_scalar ? 0 : 1]->type->components();
+   unsigned c0_inc = op0_scalar ? 0 : 1;
+   unsigned c1_inc = op1_scalar ? 0 : 1;
+   unsigned components;
+   if (op1_scalar || !op[1]) {
+      components = op[0]->type->components();
+   } else {
+      components = op[1]->type->components();
+   }
+
+   void *ctx = talloc_parent(this);
+
+   /* Handle array operations here, rather than below. */
+   if (op[0]->type->is_array()) {
+      assert(op[1] != NULL && op[1]->type->is_array());
+      switch (this->operation) {
+      case ir_binop_all_equal:
+	 return new(ctx) ir_constant(op[0]->has_value(op[1]));
+      case ir_binop_any_nequal:
+	 return new(ctx) ir_constant(!op[0]->has_value(op[1]));
+      default:
+	 break;
+      }
+      return NULL;
+   }
+
+   switch (this->operation) {
+   case ir_unop_bit_not:
+       switch (op[0]->type->base_type) {
+       case GLSL_TYPE_INT:
+           for (unsigned c = 0; c < components; c++)
+               data.i[c] = ~ op[0]->value.i[c];
+           break;
+       case GLSL_TYPE_UINT:
+           for (unsigned c = 0; c < components; c++)
+               data.u[c] = ~ op[0]->value.u[c];
+           break;
+       default:
+           assert(0);
+       }
+       break;
 
-   switch (ir->operation) {
    case ir_unop_logic_not:
       assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++)
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
 	 data.b[c] = !op[0]->value.b[c];
       break;
 
    case ir_unop_f2i:
       assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 data.i[c] = op[0]->value.f[c];
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.i[c] = (int) op[0]->value.f[c];
       }
       break;
    case ir_unop_i2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_UINT ||
-	     op[0]->type->base_type == GLSL_TYPE_INT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 if (op[0]->type->base_type == GLSL_TYPE_INT)
-	    data.f[c] = op[0]->value.i[c];
-	 else
-	    data.f[c] = op[0]->value.u[c];
+      assert(op[0]->type->base_type == GLSL_TYPE_INT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = (float) op[0]->value.i[c];
+      }
+      break;
+   case ir_unop_u2f:
+      assert(op[0]->type->base_type == GLSL_TYPE_UINT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = (float) op[0]->value.u[c];
       }
       break;
    case ir_unop_b2f:
       assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 data.f[c] = op[0]->value.b[c] ? 1.0 : 0.0;
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = op[0]->value.b[c] ? 1.0F : 0.0F;
       }
       break;
    case ir_unop_f2b:
       assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 data.b[c] = bool(op[0]->value.f[c]);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.b[c] = op[0]->value.f[c] != 0.0F ? true : false;
       }
       break;
    case ir_unop_b2i:
       assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
 	 data.u[c] = op[0]->value.b[c] ? 1 : 0;
       }
       break;
    case ir_unop_i2b:
       assert(op[0]->type->is_integer());
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 data.b[c] = bool(op[0]->value.u[c]);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.b[c] = op[0]->value.u[c] ? true : false;
+      }
+      break;
+
+   case ir_unop_any:
+      assert(op[0]->type->is_boolean());
+      data.b[0] = false;
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 if (op[0]->value.b[c])
+	    data.b[0] = true;
+      }
+      break;
+
+   case ir_unop_trunc:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = truncf(op[0]->value.f[c]);
+      }
+      break;
+
+   case ir_unop_ceil:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = ceilf(op[0]->value.f[c]);
+      }
+      break;
+
+   case ir_unop_floor:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = floorf(op[0]->value.f[c]);
       }
       break;
 
    case ir_unop_fract:
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 switch (ir->type->base_type) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (this->type->base_type) {
 	 case GLSL_TYPE_UINT:
 	    data.u[c] = 0;
 	    break;
@@ -219,11 +215,27 @@ ir_constant_visitor::visit(ir_expression *ir)
       }
       break;
 
+   case ir_unop_sin:
+   case ir_unop_sin_reduced:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = sinf(op[0]->value.f[c]);
+      }
+      break;
+
+   case ir_unop_cos:
+   case ir_unop_cos_reduced:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = cosf(op[0]->value.f[c]);
+      }
+      break;
+
    case ir_unop_neg:
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 switch (ir->type->base_type) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (this->type->base_type) {
 	 case GLSL_TYPE_UINT:
-	    data.u[c] = -op[0]->value.u[c];
+	    data.u[c] = -((int) op[0]->value.u[c]);
 	    break;
 	 case GLSL_TYPE_INT:
 	    data.i[c] = -op[0]->value.i[c];
@@ -238,9 +250,8 @@ ir_constant_visitor::visit(ir_expression *ir)
       break;
 
    case ir_unop_abs:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 switch (ir->type->base_type) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (this->type->base_type) {
 	 case GLSL_TYPE_UINT:
 	    data.u[c] = op[0]->value.u[c];
 	    break;
@@ -258,10 +269,28 @@ ir_constant_visitor::visit(ir_expression *ir)
       }
       break;
 
+   case ir_unop_sign:
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (this->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.u[c] = op[0]->value.i[c] > 0;
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.i[c] = (op[0]->value.i[c] > 0) - (op[0]->value.i[c] < 0);
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.f[c] = float((op[0]->value.f[c] > 0)-(op[0]->value.f[c] < 0));
+	    break;
+	 default:
+	    assert(0);
+	 }
+      }
+      break;
+
    case ir_unop_rcp:
       assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 switch (ir->type->base_type) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (this->type->base_type) {
 	 case GLSL_TYPE_UINT:
 	    if (op[0]->value.u[c] != 0.0)
 	       data.u[c] = 1 / op[0]->value.u[c];
@@ -272,7 +301,7 @@ ir_constant_visitor::visit(ir_expression *ir)
 	    break;
 	 case GLSL_TYPE_FLOAT:
 	    if (op[0]->value.f[c] != 0.0)
-	       data.f[c] = 1.0 / op[0]->value.f[c];
+	       data.f[c] = 1.0F / op[0]->value.f[c];
 	    break;
 	 default:
 	    assert(0);
@@ -282,53 +311,80 @@ ir_constant_visitor::visit(ir_expression *ir)
 
    case ir_unop_rsq:
       assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 data.f[c] = 1.0 / sqrtf(op[0]->value.f[c]);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = 1.0F / sqrtf(op[0]->value.f[c]);
       }
       break;
 
    case ir_unop_sqrt:
       assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
 	 data.f[c] = sqrtf(op[0]->value.f[c]);
       }
       break;
 
    case ir_unop_exp:
       assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
 	 data.f[c] = expf(op[0]->value.f[c]);
       }
       break;
 
+   case ir_unop_exp2:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = exp2f(op[0]->value.f[c]);
+      }
+      break;
+
    case ir_unop_log:
       assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
 	 data.f[c] = logf(op[0]->value.f[c]);
       }
       break;
 
+   case ir_unop_log2:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 data.f[c] = log2f(op[0]->value.f[c]);
+      }
+      break;
+
    case ir_unop_dFdx:
    case ir_unop_dFdy:
       assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
 	 data.f[c] = 0.0;
       }
       break;
 
-   case ir_binop_dot:
-      assert(op[0]->type->is_vector() && op[1]->type->is_vector());
-      data.f[0] = 0;
+   case ir_binop_pow:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
       for (unsigned c = 0; c < op[0]->type->components(); c++) {
-	 switch (ir->operands[0]->type->base_type) {
+	 data.f[c] = powf(op[0]->value.f[c], op[1]->value.f[c]);
+      }
+      break;
+
+   case ir_binop_dot:
+      data.f[0] = dot(op[0], op[1]);
+      break;
+
+   case ir_binop_min:
+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
+      for (unsigned c = 0, c0 = 0, c1 = 0;
+	   c < components;
+	   c0 += c0_inc, c1 += c1_inc, c++) {
+
+	 switch (op[0]->type->base_type) {
 	 case GLSL_TYPE_UINT:
-	    data.u[0] += op[0]->value.u[c] * op[1]->value.u[c];
+	    data.u[c] = MIN2(op[0]->value.u[c0], op[1]->value.u[c1]);
 	    break;
 	 case GLSL_TYPE_INT:
-	    data.i[0] += op[0]->value.i[c] * op[1]->value.i[c];
+	    data.i[c] = MIN2(op[0]->value.i[c0], op[1]->value.i[c1]);
 	    break;
 	 case GLSL_TYPE_FLOAT:
-	    data.f[0] += op[0]->value.f[c] * op[1]->value.f[c];
+	    data.f[c] = MIN2(op[0]->value.f[c0], op[1]->value.f[c1]);
 	    break;
 	 default:
 	    assert(0);
@@ -336,13 +392,35 @@ ir_constant_visitor::visit(ir_expression *ir)
       }
 
       break;
+   case ir_binop_max:
+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
+      for (unsigned c = 0, c0 = 0, c1 = 0;
+	   c < components;
+	   c0 += c0_inc, c1 += c1_inc, c++) {
+
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.u[c] = MAX2(op[0]->value.u[c0], op[1]->value.u[c1]);
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.i[c] = MAX2(op[0]->value.i[c0], op[1]->value.i[c1]);
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.f[c] = MAX2(op[0]->value.f[c0], op[1]->value.f[c1]);
+	    break;
+	 default:
+	    assert(0);
+	 }
+      }
+      break;
+
    case ir_binop_add:
       assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
       for (unsigned c = 0, c0 = 0, c1 = 0;
 	   c < components;
 	   c0 += c0_inc, c1 += c1_inc, c++) {
 
-	 switch (ir->operands[0]->type->base_type) {
+	 switch (op[0]->type->base_type) {
 	 case GLSL_TYPE_UINT:
 	    data.u[c] = op[0]->value.u[c0] + op[1]->value.u[c1];
 	    break;
@@ -364,7 +442,7 @@ ir_constant_visitor::visit(ir_expression *ir)
 	   c < components;
 	   c0 += c0_inc, c1 += c1_inc, c++) {
 
-	 switch (ir->operands[0]->type->base_type) {
+	 switch (op[0]->type->base_type) {
 	 case GLSL_TYPE_UINT:
 	    data.u[c] = op[0]->value.u[c0] - op[1]->value.u[c1];
 	    break;
@@ -388,7 +466,7 @@ ir_constant_visitor::visit(ir_expression *ir)
 	      c < components;
 	      c0 += c0_inc, c1 += c1_inc, c++) {
 
-	    switch (ir->operands[0]->type->base_type) {
+	    switch (op[0]->type->base_type) {
 	    case GLSL_TYPE_UINT:
 	       data.u[c] = op[0]->value.u[c0] * op[1]->value.u[c1];
 	       break;
@@ -434,7 +512,7 @@ ir_constant_visitor::visit(ir_expression *ir)
 	   c < components;
 	   c0 += c0_inc, c1 += c1_inc, c++) {
 
-	 switch (ir->operands[0]->type->base_type) {
+	 switch (op[0]->type->base_type) {
 	 case GLSL_TYPE_UINT:
 	    data.u[c] = op[0]->value.u[c0] / op[1]->value.u[c1];
 	    break;
@@ -450,98 +528,133 @@ ir_constant_visitor::visit(ir_expression *ir)
       }
 
       break;
+   case ir_binop_mod:
+      assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
+      for (unsigned c = 0, c0 = 0, c1 = 0;
+	   c < components;
+	   c0 += c0_inc, c1 += c1_inc, c++) {
+
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.u[c] = op[0]->value.u[c0] % op[1]->value.u[c1];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.i[c] = op[0]->value.i[c0] % op[1]->value.i[c1];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    /* We don't use fmod because it rounds toward zero; GLSL specifies
+	     * the use of floor.
+	     */
+	    data.f[c] = op[0]->value.f[c0] - op[1]->value.f[c1]
+	       * floorf(op[0]->value.f[c0] / op[1]->value.f[c1]);
+	    break;
+	 default:
+	    assert(0);
+	 }
+      }
+
+      break;
+
    case ir_binop_logic_and:
       assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++)
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
 	 data.b[c] = op[0]->value.b[c] && op[1]->value.b[c];
       break;
    case ir_binop_logic_xor:
       assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++)
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
 	 data.b[c] = op[0]->value.b[c] ^ op[1]->value.b[c];
       break;
    case ir_binop_logic_or:
       assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++)
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
 	 data.b[c] = op[0]->value.b[c] || op[1]->value.b[c];
       break;
 
    case ir_binop_less:
-      switch (ir->operands[0]->type->base_type) {
-      case GLSL_TYPE_UINT:
-	 data.b[0] = op[0]->value.u[0] < op[1]->value.u[0];
-	 break;
-      case GLSL_TYPE_INT:
-	 data.b[0] = op[0]->value.i[0] < op[1]->value.i[0];
-	 break;
-      case GLSL_TYPE_FLOAT:
-	 data.b[0] = op[0]->value.f[0] < op[1]->value.f[0];
-	 break;
-      default:
-	 assert(0);
+      assert(op[0]->type == op[1]->type);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[0] = op[0]->value.u[0] < op[1]->value.u[0];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[0] = op[0]->value.i[0] < op[1]->value.i[0];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[0] = op[0]->value.f[0] < op[1]->value.f[0];
+	    break;
+	 default:
+	    assert(0);
+	 }
       }
       break;
    case ir_binop_greater:
-      switch (ir->operands[0]->type->base_type) {
-      case GLSL_TYPE_UINT:
-	 data.b[0] = op[0]->value.u[0] > op[1]->value.u[0];
-	 break;
-      case GLSL_TYPE_INT:
-	 data.b[0] = op[0]->value.i[0] > op[1]->value.i[0];
-	 break;
-      case GLSL_TYPE_FLOAT:
-	 data.b[0] = op[0]->value.f[0] > op[1]->value.f[0];
-	 break;
-      default:
-	 assert(0);
+      assert(op[0]->type == op[1]->type);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[c] = op[0]->value.u[c] > op[1]->value.u[c];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[c] = op[0]->value.i[c] > op[1]->value.i[c];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[c] = op[0]->value.f[c] > op[1]->value.f[c];
+	    break;
+	 default:
+	    assert(0);
+	 }
       }
       break;
    case ir_binop_lequal:
-      switch (ir->operands[0]->type->base_type) {
-      case GLSL_TYPE_UINT:
-	 data.b[0] = op[0]->value.u[0] <= op[1]->value.u[0];
-	 break;
-      case GLSL_TYPE_INT:
-	 data.b[0] = op[0]->value.i[0] <= op[1]->value.i[0];
-	 break;
-      case GLSL_TYPE_FLOAT:
-	 data.b[0] = op[0]->value.f[0] <= op[1]->value.f[0];
-	 break;
-      default:
-	 assert(0);
+      assert(op[0]->type == op[1]->type);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[0] = op[0]->value.u[0] <= op[1]->value.u[0];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[0] = op[0]->value.i[0] <= op[1]->value.i[0];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[0] = op[0]->value.f[0] <= op[1]->value.f[0];
+	    break;
+	 default:
+	    assert(0);
+	 }
       }
       break;
    case ir_binop_gequal:
-      switch (ir->operands[0]->type->base_type) {
-      case GLSL_TYPE_UINT:
-	 data.b[0] = op[0]->value.u[0] >= op[1]->value.u[0];
-	 break;
-      case GLSL_TYPE_INT:
-	 data.b[0] = op[0]->value.i[0] >= op[1]->value.i[0];
-	 break;
-      case GLSL_TYPE_FLOAT:
-	 data.b[0] = op[0]->value.f[0] >= op[1]->value.f[0];
-	 break;
-      default:
-	 assert(0);
+      assert(op[0]->type == op[1]->type);
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[0] = op[0]->value.u[0] >= op[1]->value.u[0];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[0] = op[0]->value.i[0] >= op[1]->value.i[0];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[0] = op[0]->value.f[0] >= op[1]->value.f[0];
+	    break;
+	 default:
+	    assert(0);
+	 }
       }
       break;
-
    case ir_binop_equal:
-      data.b[0] = true;
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 switch (ir->operands[0]->type->base_type) {
+      assert(op[0]->type == op[1]->type);
+      for (unsigned c = 0; c < components; c++) {
+	 switch (op[0]->type->base_type) {
 	 case GLSL_TYPE_UINT:
-	    data.b[0] = data.b[0] && op[0]->value.u[c] == op[1]->value.u[c];
+	    data.b[c] = op[0]->value.u[c] == op[1]->value.u[c];
 	    break;
 	 case GLSL_TYPE_INT:
-	    data.b[0] = data.b[0] && op[0]->value.i[c] == op[1]->value.i[c];
+	    data.b[c] = op[0]->value.i[c] == op[1]->value.i[c];
 	    break;
 	 case GLSL_TYPE_FLOAT:
-	    data.b[0] = data.b[0] && op[0]->value.f[c] == op[1]->value.f[c];
-	    break;
-	 case GLSL_TYPE_BOOL:
-	    data.b[0] = data.b[0] && op[0]->value.b[c] == op[1]->value.b[c];
+	    data.b[c] = op[0]->value.f[c] == op[1]->value.f[c];
 	    break;
 	 default:
 	    assert(0);
@@ -549,20 +662,143 @@ ir_constant_visitor::visit(ir_expression *ir)
       }
       break;
    case ir_binop_nequal:
-      data.b[0] = false;
-      for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
-	 switch (ir->operands[0]->type->base_type) {
+      assert(op[0]->type != op[1]->type);
+      for (unsigned c = 0; c < components; c++) {
+	 switch (op[0]->type->base_type) {
 	 case GLSL_TYPE_UINT:
-	    data.b[0] = data.b[0] || op[0]->value.u[c] != op[1]->value.u[c];
+	    data.b[c] = op[0]->value.u[c] != op[1]->value.u[c];
 	    break;
 	 case GLSL_TYPE_INT:
-	    data.b[0] = data.b[0] || op[0]->value.i[c] != op[1]->value.i[c];
+	    data.b[c] = op[0]->value.i[c] != op[1]->value.i[c];
 	    break;
 	 case GLSL_TYPE_FLOAT:
-	    data.b[0] = data.b[0] || op[0]->value.f[c] != op[1]->value.f[c];
+	    data.b[c] = op[0]->value.f[c] != op[1]->value.f[c];
 	    break;
-	 case GLSL_TYPE_BOOL:
-	    data.b[0] = data.b[0] || op[0]->value.b[c] != op[1]->value.b[c];
+	 default:
+	    assert(0);
+	 }
+      }
+      break;
+   case ir_binop_all_equal:
+      data.b[0] = op[0]->has_value(op[1]);
+      break;
+   case ir_binop_any_nequal:
+      data.b[0] = !op[0]->has_value(op[1]);
+      break;
+
+   case ir_binop_lshift:
+      for (unsigned c = 0, c0 = 0, c1 = 0;
+           c < components;
+           c0 += c0_inc, c1 += c1_inc, c++) {
+
+          if (op[0]->type->base_type == GLSL_TYPE_INT &&
+              op[1]->type->base_type == GLSL_TYPE_INT) {
+              data.i[c] = op[0]->value.i[c0] << op[1]->value.i[c1];
+
+          } else if (op[0]->type->base_type == GLSL_TYPE_INT &&
+                     op[1]->type->base_type == GLSL_TYPE_UINT) {
+              data.i[c] = op[0]->value.i[c0] << op[1]->value.u[c1];
+
+          } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&
+                     op[1]->type->base_type == GLSL_TYPE_INT) {
+              data.u[c] = op[0]->value.u[c0] << op[1]->value.i[c1];
+
+          } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&
+                     op[1]->type->base_type == GLSL_TYPE_UINT) {
+              data.u[c] = op[0]->value.u[c0] << op[1]->value.u[c1];
+          }
+      }
+      break;
+
+   case ir_binop_rshift:
+       for (unsigned c = 0, c0 = 0, c1 = 0;
+            c < components;
+            c0 += c0_inc, c1 += c1_inc, c++) {
+
+           if (op[0]->type->base_type == GLSL_TYPE_INT &&
+               op[1]->type->base_type == GLSL_TYPE_INT) {
+               data.i[c] = op[0]->value.i[c0] >> op[1]->value.i[c1];
+
+           } else if (op[0]->type->base_type == GLSL_TYPE_INT &&
+                      op[1]->type->base_type == GLSL_TYPE_UINT) {
+               data.i[c] = op[0]->value.i[c0] >> op[1]->value.u[c1];
+
+           } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&
+                      op[1]->type->base_type == GLSL_TYPE_INT) {
+               data.u[c] = op[0]->value.u[c0] >> op[1]->value.i[c1];
+
+           } else if (op[0]->type->base_type == GLSL_TYPE_UINT &&
+                      op[1]->type->base_type == GLSL_TYPE_UINT) {
+               data.u[c] = op[0]->value.u[c0] >> op[1]->value.u[c1];
+           }
+       }
+       break;
+
+   case ir_binop_bit_and:
+      for (unsigned c = 0, c0 = 0, c1 = 0;
+           c < components;
+           c0 += c0_inc, c1 += c1_inc, c++) {
+
+          switch (op[0]->type->base_type) {
+          case GLSL_TYPE_INT:
+              data.i[c] = op[0]->value.i[c0] & op[1]->value.i[c1];
+              break;
+          case GLSL_TYPE_UINT:
+              data.u[c] = op[0]->value.u[c0] & op[1]->value.u[c1];
+              break;
+          default:
+              assert(0);
+          }
+      }
+      break;
+
+   case ir_binop_bit_or:
+      for (unsigned c = 0, c0 = 0, c1 = 0;
+           c < components;
+           c0 += c0_inc, c1 += c1_inc, c++) {
+
+          switch (op[0]->type->base_type) {
+          case GLSL_TYPE_INT:
+              data.i[c] = op[0]->value.i[c0] | op[1]->value.i[c1];
+              break;
+          case GLSL_TYPE_UINT:
+              data.u[c] = op[0]->value.u[c0] | op[1]->value.u[c1];
+              break;
+          default:
+              assert(0);
+          }
+      }
+      break;
+
+   case ir_binop_bit_xor:
+      for (unsigned c = 0, c0 = 0, c1 = 0;
+           c < components;
+           c0 += c0_inc, c1 += c1_inc, c++) {
+
+          switch (op[0]->type->base_type) {
+          case GLSL_TYPE_INT:
+              data.i[c] = op[0]->value.i[c0] ^ op[1]->value.i[c1];
+              break;
+          case GLSL_TYPE_UINT:
+              data.u[c] = op[0]->value.u[c0] ^ op[1]->value.u[c1];
+              break;
+          default:
+              assert(0);
+          }
+      }
+      break;
+
+   case ir_quadop_vector:
+      for (unsigned c = 0; c < this->type->vector_elements; c++) {
+	 switch (this->type->base_type) {
+	 case GLSL_TYPE_INT:
+	    data.i[c] = op[c]->value.i[0];
+	    break;
+	 case GLSL_TYPE_UINT:
+	    data.u[c] = op[c]->value.u[0];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.f[c] = op[c]->value.f[0];
 	    break;
 	 default:
 	    assert(0);
@@ -572,38 +808,34 @@ ir_constant_visitor::visit(ir_expression *ir)
 
    default:
       /* FINISHME: Should handle all expression types. */
-      return;
+      return NULL;
    }
 
-   void *ctx = talloc_parent(ir);
-   this->value = new(ctx) ir_constant(ir->type, &data);
+   return new(ctx) ir_constant(this->type, &data);
 }
 
 
-void
-ir_constant_visitor::visit(ir_texture *ir)
+ir_constant *
+ir_texture::constant_expression_value()
 {
-   // FINISHME: Do stuff with texture lookups
-   (void) ir;
-   value = NULL;
+   /* texture lookups aren't constant expressions */
+   return NULL;
 }
 
 
-void
-ir_constant_visitor::visit(ir_swizzle *ir)
+ir_constant *
+ir_swizzle::constant_expression_value()
 {
-   ir_constant *v = ir->val->constant_expression_value();
-
-   this->value = NULL;
+   ir_constant *v = this->val->constant_expression_value();
 
    if (v != NULL) {
-      ir_constant_data data;
+      ir_constant_data data = { { 0 } };
 
       const unsigned swiz_idx[4] = {
-	 ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w
+	 this->mask.x, this->mask.y, this->mask.z, this->mask.w
       };
 
-      for (unsigned i = 0; i < ir->mask.num_components; i++) {
+      for (unsigned i = 0; i < this->mask.num_components; i++) {
 	 switch (v->type->base_type) {
 	 case GLSL_TYPE_UINT:
 	 case GLSL_TYPE_INT:   data.u[i] = v->value.u[swiz_idx[i]]; break;
@@ -613,33 +845,41 @@ ir_constant_visitor::visit(ir_swizzle *ir)
 	 }
       }
 
-      void *ctx = talloc_parent(ir);
-      this->value = new(ctx) ir_constant(ir->type, &data);
+      void *ctx = talloc_parent(this);
+      return new(ctx) ir_constant(this->type, &data);
    }
+   return NULL;
 }
 
 
-void
-ir_constant_visitor::visit(ir_dereference_variable *ir)
+ir_constant *
+ir_dereference_variable::constant_expression_value()
 {
-   value = NULL;
+   /* This may occur during compile and var->type is glsl_type::error_type */
+   if (!var)
+      return NULL;
+
+   /* The constant_value of a uniform variable is its initializer,
+    * not the lifetime constant value of the uniform.
+    */
+   if (var->mode == ir_var_uniform)
+      return NULL;
 
-   ir_variable *var = ir->variable_referenced();
-   if (var && var->constant_value)
-      value = var->constant_value->clone(NULL);
+   if (!var->constant_value)
+      return NULL;
+
+   return var->constant_value->clone(talloc_parent(var), NULL);
 }
 
 
-void
-ir_constant_visitor::visit(ir_dereference_array *ir)
+ir_constant *
+ir_dereference_array::constant_expression_value()
 {
-   void *ctx = talloc_parent(ir);
-   ir_constant *array = ir->array->constant_expression_value();
-   ir_constant *idx = ir->array_index->constant_expression_value();
-
-   this->value = NULL;
+   ir_constant *array = this->array->constant_expression_value();
+   ir_constant *idx = this->array_index->constant_expression_value();
 
    if ((array != NULL) && (idx != NULL)) {
+      void *ctx = talloc_parent(this);
       if (array->type->is_matrix()) {
 	 /* Array access of a matrix results in a vector.
 	  */
@@ -652,7 +892,7 @@ ir_constant_visitor::visit(ir_dereference_array *ir)
 	  */
 	 const unsigned mat_idx = column * column_type->vector_elements;
 
-	 ir_constant_data data;
+	 ir_constant_data data = { { 0 } };
 
 	 switch (column_type->base_type) {
 	 case GLSL_TYPE_UINT:
@@ -673,85 +913,442 @@ ir_constant_visitor::visit(ir_dereference_array *ir)
 	    break;
 	 }
 
-	 this->value = new(ctx) ir_constant(column_type, &data);
+	 return new(ctx) ir_constant(column_type, &data);
       } else if (array->type->is_vector()) {
 	 const unsigned component = idx->value.u[0];
 
-	 this->value = new(ctx) ir_constant(array, component);
+	 return new(ctx) ir_constant(array, component);
       } else {
-	 /* FINISHME: Handle access of constant arrays. */
+	 const unsigned index = idx->value.u[0];
+	 return array->get_array_element(index)->clone(ctx, NULL);
       }
    }
+   return NULL;
 }
 
 
-void
-ir_constant_visitor::visit(ir_dereference_record *ir)
+ir_constant *
+ir_dereference_record::constant_expression_value()
 {
-   ir_constant *v = ir->record->constant_expression_value();
+   ir_constant *v = this->record->constant_expression_value();
 
-   this->value = (v != NULL) ? v->get_record_field(ir->field) : NULL;
+   return (v != NULL) ? v->get_record_field(this->field) : NULL;
 }
 
 
-void
-ir_constant_visitor::visit(ir_assignment *ir)
+ir_constant *
+ir_assignment::constant_expression_value()
 {
-   (void) ir;
-   value = NULL;
+   /* FINISHME: Handle CEs involving assignment (return RHS) */
+   return NULL;
 }
 
 
-void
-ir_constant_visitor::visit(ir_constant *ir)
+ir_constant *
+ir_constant::constant_expression_value()
 {
-   value = ir;
+   return this;
 }
 
 
-void
-ir_constant_visitor::visit(ir_call *ir)
+ir_constant *
+ir_call::constant_expression_value()
 {
-   (void) ir;
-   value = NULL;
-}
+   if (this->type == glsl_type::error_type)
+      return NULL;
 
+   /* From the GLSL 1.20 spec, page 23:
+    * "Function calls to user-defined functions (non-built-in functions)
+    *  cannot be used to form constant expressions."
+    */
+   if (!this->callee->is_builtin)
+      return NULL;
 
-void
-ir_constant_visitor::visit(ir_return *ir)
-{
-   (void) ir;
-   value = NULL;
-}
+   unsigned num_parameters = 0;
 
+   /* Check if all parameters are constant */
+   ir_constant *op[3];
+   foreach_list(n, &this->actual_parameters) {
+      ir_constant *constant = ((ir_rvalue *) n)->constant_expression_value();
+      if (constant == NULL)
+	 return NULL;
 
-void
-ir_constant_visitor::visit(ir_discard *ir)
-{
-   (void) ir;
-   value = NULL;
-}
+      op[num_parameters] = constant;
 
+      assert(num_parameters < 3);
+      num_parameters++;
+   }
 
-void
-ir_constant_visitor::visit(ir_if *ir)
-{
-   (void) ir;
-   value = NULL;
-}
+   /* Individual cases below can either:
+    * - Assign "expr" a new ir_expression to evaluate (for basic opcodes)
+    * - Fill "data" with appopriate constant data
+    * - Return an ir_constant directly.
+    */
+   void *mem_ctx = talloc_parent(this);
+   ir_expression *expr = NULL;
 
+   ir_constant_data data;
+   memset(&data, 0, sizeof(data));
 
-void
-ir_constant_visitor::visit(ir_loop *ir)
-{
-   (void) ir;
-   value = NULL;
-}
+   const char *callee = this->callee_name();
+   if (strcmp(callee, "abs") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_abs, type, op[0], NULL);
+   } else if (strcmp(callee, "all") == 0) {
+      assert(op[0]->type->is_boolean());
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 if (!op[0]->value.b[c])
+	    return new(mem_ctx) ir_constant(false);
+      }
+      return new(mem_ctx) ir_constant(true);
+   } else if (strcmp(callee, "any") == 0) {
+      assert(op[0]->type->is_boolean());
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 if (op[0]->value.b[c])
+	    return new(mem_ctx) ir_constant(true);
+      }
+      return new(mem_ctx) ir_constant(false);
+   } else if (strcmp(callee, "acos") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = acosf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "acosh") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = acoshf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "asin") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = asinf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "asinh") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = asinhf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "atan") == 0) {
+      assert(op[0]->type->is_float());
+      if (num_parameters == 2) {
+	 assert(op[1]->type->is_float());
+	 for (unsigned c = 0; c < op[0]->type->components(); c++)
+	    data.f[c] = atan2f(op[0]->value.f[c], op[1]->value.f[c]);
+      } else {
+	 for (unsigned c = 0; c < op[0]->type->components(); c++)
+	    data.f[c] = atanf(op[0]->value.f[c]);
+      }
+   } else if (strcmp(callee, "atanh") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = atanhf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "dFdx") == 0 || strcmp(callee, "dFdy") == 0) {
+      return ir_constant::zero(mem_ctx, this->type);
+   } else if (strcmp(callee, "ceil") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_ceil, type, op[0], NULL);
+   } else if (strcmp(callee, "clamp") == 0) {
+      assert(num_parameters == 3);
+      unsigned c1_inc = op[1]->type->is_scalar() ? 0 : 1;
+      unsigned c2_inc = op[2]->type->is_scalar() ? 0 : 1;
+      for (unsigned c = 0, c1 = 0, c2 = 0;
+	   c < op[0]->type->components();
+	   c1 += c1_inc, c2 += c2_inc, c++) {
+
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.u[c] = CLAMP(op[0]->value.u[c], op[1]->value.u[c1],
+			      op[2]->value.u[c2]);
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.i[c] = CLAMP(op[0]->value.i[c], op[1]->value.i[c1],
+			      op[2]->value.i[c2]);
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.f[c] = CLAMP(op[0]->value.f[c], op[1]->value.f[c1],
+			      op[2]->value.f[c2]);
+	    break;
+	 default:
+	    assert(!"Should not get here.");
+	 }
+      }
+   } else if (strcmp(callee, "cos") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_cos, type, op[0], NULL);
+   } else if (strcmp(callee, "cosh") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = coshf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "cross") == 0) {
+      assert(op[0]->type == glsl_type::vec3_type);
+      assert(op[1]->type == glsl_type::vec3_type);
+      data.f[0] = (op[0]->value.f[1] * op[1]->value.f[2] -
+		   op[1]->value.f[1] * op[0]->value.f[2]);
+      data.f[1] = (op[0]->value.f[2] * op[1]->value.f[0] -
+		   op[1]->value.f[2] * op[0]->value.f[0]);
+      data.f[2] = (op[0]->value.f[0] * op[1]->value.f[1] -
+		   op[1]->value.f[0] * op[0]->value.f[1]);
+   } else if (strcmp(callee, "degrees") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = 180.0F / M_PI * op[0]->value.f[c];
+   } else if (strcmp(callee, "distance") == 0) {
+      assert(op[0]->type->is_float() && op[1]->type->is_float());
+      float length_squared = 0.0;
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 float t = op[0]->value.f[c] - op[1]->value.f[c];
+	 length_squared += t * t;
+      }
+      return new(mem_ctx) ir_constant(sqrtf(length_squared));
+   } else if (strcmp(callee, "dot") == 0) {
+      return new(mem_ctx) ir_constant(dot(op[0], op[1]));
+   } else if (strcmp(callee, "equal") == 0) {
+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[c] = op[0]->value.u[c] == op[1]->value.u[c];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[c] = op[0]->value.i[c] == op[1]->value.i[c];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[c] = op[0]->value.f[c] == op[1]->value.f[c];
+	    break;
+	 case GLSL_TYPE_BOOL:
+	    data.b[c] = op[0]->value.b[c] == op[1]->value.b[c];
+	    break;
+	 default:
+	    assert(!"Should not get here.");
+	 }
+      }
+   } else if (strcmp(callee, "exp") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_exp, type, op[0], NULL);
+   } else if (strcmp(callee, "exp2") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_exp2, type, op[0], NULL);
+   } else if (strcmp(callee, "faceforward") == 0) {
+      if (dot(op[2], op[1]) < 0)
+	 return op[0];
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = -op[0]->value.f[c];
+   } else if (strcmp(callee, "floor") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_floor, type, op[0], NULL);
+   } else if (strcmp(callee, "fract") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_fract, type, op[0], NULL);
+   } else if (strcmp(callee, "fwidth") == 0) {
+      return ir_constant::zero(mem_ctx, this->type);
+   } else if (strcmp(callee, "greaterThan") == 0) {
+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[c] = op[0]->value.u[c] > op[1]->value.u[c];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[c] = op[0]->value.i[c] > op[1]->value.i[c];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[c] = op[0]->value.f[c] > op[1]->value.f[c];
+	    break;
+	 default:
+	    assert(!"Should not get here.");
+	 }
+      }
+   } else if (strcmp(callee, "greaterThanEqual") == 0) {
+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[c] = op[0]->value.u[c] >= op[1]->value.u[c];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[c] = op[0]->value.i[c] >= op[1]->value.i[c];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[c] = op[0]->value.f[c] >= op[1]->value.f[c];
+	    break;
+	 default:
+	    assert(!"Should not get here.");
+	 }
+      }
+   } else if (strcmp(callee, "inversesqrt") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_rsq, type, op[0], NULL);
+   } else if (strcmp(callee, "length") == 0) {
+      return new(mem_ctx) ir_constant(sqrtf(dot(op[0], op[0])));
+   } else if (strcmp(callee, "lessThan") == 0) {
+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[c] = op[0]->value.u[c] < op[1]->value.u[c];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[c] = op[0]->value.i[c] < op[1]->value.i[c];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[c] = op[0]->value.f[c] < op[1]->value.f[c];
+	    break;
+	 default:
+	    assert(!"Should not get here.");
+	 }
+      }
+   } else if (strcmp(callee, "lessThanEqual") == 0) {
+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[c] = op[0]->value.u[c] <= op[1]->value.u[c];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[c] = op[0]->value.i[c] <= op[1]->value.i[c];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[c] = op[0]->value.f[c] <= op[1]->value.f[c];
+	    break;
+	 default:
+	    assert(!"Should not get here.");
+	 }
+      }
+   } else if (strcmp(callee, "log") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_log, type, op[0], NULL);
+   } else if (strcmp(callee, "log2") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_log2, type, op[0], NULL);
+   } else if (strcmp(callee, "matrixCompMult") == 0) {
+      assert(op[0]->type->is_float() && op[1]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = op[0]->value.f[c] * op[1]->value.f[c];
+   } else if (strcmp(callee, "max") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_binop_max, type, op[0], op[1]);
+   } else if (strcmp(callee, "min") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_binop_min, type, op[0], op[1]);
+   } else if (strcmp(callee, "mix") == 0) {
+      assert(op[0]->type->is_float() && op[1]->type->is_float());
+      if (op[2]->type->is_float()) {
+	 unsigned c2_inc = op[2]->type->is_scalar() ? 0 : 1;
+	 unsigned components = op[0]->type->components();
+	 for (unsigned c = 0, c2 = 0; c < components; c2 += c2_inc, c++) {
+	    data.f[c] = op[0]->value.f[c] * (1 - op[2]->value.f[c2]) +
+			op[1]->value.f[c] * op[2]->value.f[c2];
+	 }
+      } else {
+	 assert(op[2]->type->is_boolean());
+	 for (unsigned c = 0; c < op[0]->type->components(); c++)
+	    data.f[c] = op[op[2]->value.b[c] ? 1 : 0]->value.f[c];
+      }
+   } else if (strcmp(callee, "mod") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_binop_mod, type, op[0], op[1]);
+   } else if (strcmp(callee, "normalize") == 0) {
+      assert(op[0]->type->is_float());
+      float length = sqrtf(dot(op[0], op[0]));
+
+      if (length == 0)
+	 return ir_constant::zero(mem_ctx, this->type);
+
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = op[0]->value.f[c] / length;
+   } else if (strcmp(callee, "not") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_logic_not, type, op[0], NULL);
+   } else if (strcmp(callee, "notEqual") == 0) {
+      assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
+      for (unsigned c = 0; c < op[0]->type->components(); c++) {
+	 switch (op[0]->type->base_type) {
+	 case GLSL_TYPE_UINT:
+	    data.b[c] = op[0]->value.u[c] != op[1]->value.u[c];
+	    break;
+	 case GLSL_TYPE_INT:
+	    data.b[c] = op[0]->value.i[c] != op[1]->value.i[c];
+	    break;
+	 case GLSL_TYPE_FLOAT:
+	    data.b[c] = op[0]->value.f[c] != op[1]->value.f[c];
+	    break;
+	 case GLSL_TYPE_BOOL:
+	    data.b[c] = op[0]->value.b[c] != op[1]->value.b[c];
+	    break;
+	 default:
+	    assert(!"Should not get here.");
+	 }
+      }
+   } else if (strcmp(callee, "outerProduct") == 0) {
+      assert(op[0]->type->is_vector() && op[1]->type->is_vector());
+      const unsigned m = op[0]->type->vector_elements;
+      const unsigned n = op[1]->type->vector_elements;
+      for (unsigned j = 0; j < n; j++) {
+	 for (unsigned i = 0; i < m; i++) {
+	    data.f[i+m*j] = op[0]->value.f[i] * op[1]->value.f[j];
+	 }
+      }
+   } else if (strcmp(callee, "pow") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_binop_pow, type, op[0], op[1]);
+   } else if (strcmp(callee, "radians") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = M_PI / 180.0F * op[0]->value.f[c];
+   } else if (strcmp(callee, "reflect") == 0) {
+      assert(op[0]->type->is_float());
+      float dot_NI = dot(op[1], op[0]);
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = op[0]->value.f[c] - 2 * dot_NI * op[1]->value.f[c];
+   } else if (strcmp(callee, "refract") == 0) {
+      const float eta = op[2]->value.f[0];
+      const float dot_NI = dot(op[1], op[0]);
+      const float k = 1.0F - eta * eta * (1.0F - dot_NI * dot_NI);
+      if (k < 0.0) {
+	 return ir_constant::zero(mem_ctx, this->type);
+      } else {
+	 for (unsigned c = 0; c < type->components(); c++) {
+	    data.f[c] = eta * op[0]->value.f[c] - (eta * dot_NI + sqrtf(k))
+			    * op[1]->value.f[c];
+	 }
+      }
+   } else if (strcmp(callee, "sign") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_sign, type, op[0], NULL);
+   } else if (strcmp(callee, "sin") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_sin, type, op[0], NULL);
+   } else if (strcmp(callee, "sinh") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = sinhf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "smoothstep") == 0) {
+      assert(num_parameters == 3);
+      assert(op[1]->type == op[0]->type);
+      unsigned edge_inc = op[0]->type->is_scalar() ? 0 : 1;
+      for (unsigned c = 0, e = 0; c < type->components(); e += edge_inc, c++) {
+	 const float edge0 = op[0]->value.f[e];
+	 const float edge1 = op[1]->value.f[e];
+	 if (edge0 == edge1) {
+	    data.f[c] = 0.0; /* Avoid a crash - results are undefined anyway */
+	 } else {
+	    const float numerator = op[2]->value.f[c] - edge0;
+	    const float denominator = edge1 - edge0;
+	    const float t = CLAMP(numerator/denominator, 0, 1);
+	    data.f[c] = t * t * (3 - 2 * t);
+	 }
+      }
+   } else if (strcmp(callee, "sqrt") == 0) {
+      expr = new(mem_ctx) ir_expression(ir_unop_sqrt, type, op[0], NULL);
+   } else if (strcmp(callee, "step") == 0) {
+      assert(op[0]->type->is_float() && op[1]->type->is_float());
+      /* op[0] (edge) may be either a scalar or a vector */
+      const unsigned c0_inc = op[0]->type->is_scalar() ? 0 : 1;
+      for (unsigned c = 0, c0 = 0; c < type->components(); c0 += c0_inc, c++)
+	 data.f[c] = (op[1]->value.f[c] < op[0]->value.f[c0]) ? 0.0F : 1.0F;
+   } else if (strcmp(callee, "tan") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = tanf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "tanh") == 0) {
+      assert(op[0]->type->is_float());
+      for (unsigned c = 0; c < op[0]->type->components(); c++)
+	 data.f[c] = tanhf(op[0]->value.f[c]);
+   } else if (strcmp(callee, "transpose") == 0) {
+      assert(op[0]->type->is_matrix());
+      const unsigned n = op[0]->type->vector_elements;
+      const unsigned m = op[0]->type->matrix_columns;
+      for (unsigned j = 0; j < m; j++) {
+	 for (unsigned i = 0; i < n; i++) {
+	    data.f[m*i+j] += op[0]->value.f[i+n*j];
+	 }
+      }
+   } else {
+      /* Unsupported builtin - some are not allowed in constant expressions. */
+      return NULL;
+   }
 
+   if (expr != NULL)
+      return expr->constant_expression_value();
 
-void
-ir_constant_visitor::visit(ir_loop_jump *ir)
-{
-   (void) ir;
-   value = NULL;
+   return new(mem_ctx) ir_constant(this->type, &data);
 }