commit d251b92f8d32b28a91085d5b1f557c1f4756a2f2
author Eric Anholt <eric@anholt.net> Thu Apr 01 18:35:42 2010 -1000
committer Ian Romanick <ian.d.romanick@intel.com> Fri Apr 02 11:22:41 2010 -0700
tree 03883caf50ace10c25c283a89d5d00f6ee76539c
parent d98da9738ee791edae5ee6650e7a3ac08b6c26ca

Add some more operations to ir_constant_expression.cpp.

ir_constant_expression.cpp

diff --git a/ir_constant_expression.cpp b/ir_constant_expression.cpp
index e8820a0..69a3613 100644
--- a/ir_constant_expression.cpp
+++ b/ir_constant_expression.cpp
@@ -153,6 +153,46 @@
       for (c = 0; c < ir->operands[0]->type->components(); c++)
 	 b[c] = !op[0]->value.b[c];
       break;
+   case ir_binop_add:
+      if (ir->operands[0]->type == ir->operands[1]->type) {
+	 type = ir->operands[0]->type;
+	 for (c = 0; c < ir->operands[0]->type->components(); c++) {
+	    switch (ir->operands[0]->type->base_type) {
+	    case GLSL_TYPE_UINT:
+	       u[c] = op[0]->value.u[c] + op[1]->value.u[c];
+	       break;
+	    case GLSL_TYPE_INT:
+	       i[c] = op[0]->value.i[c] + op[1]->value.i[c];
+	       break;
+	    case GLSL_TYPE_FLOAT:
+	       f[c] = op[0]->value.f[c] + op[1]->value.f[c];
+	       break;
+	    default:
+	       assert(0);
+	    }
+	 }
+      }
+      break;
+   case ir_binop_sub:
+      if (ir->operands[0]->type == ir->operands[1]->type) {
+	 type = ir->operands[0]->type;
+	 for (c = 0; c < ir->operands[0]->type->components(); c++) {
+	    switch (ir->operands[0]->type->base_type) {
+	    case GLSL_TYPE_UINT:
+	       u[c] = op[0]->value.u[c] - op[1]->value.u[c];
+	       break;
+	    case GLSL_TYPE_INT:
+	       i[c] = op[0]->value.i[c] - op[1]->value.i[c];
+	       break;
+	    case GLSL_TYPE_FLOAT:
+	       f[c] = op[0]->value.f[c] - op[1]->value.f[c];
+	       break;
+	    default:
+	       assert(0);
+	    }
+	 }
+      }
+      break;
    case ir_binop_mul:
       if (ir->operands[0]->type == ir->operands[1]->type &&
 	  !ir->operands[0]->type->is_matrix()) {
@@ -174,12 +214,38 @@
 	 }
       }
       break;
+   case ir_binop_div:
+      if (ir->operands[0]->type == ir->operands[1]->type) {
+	 type = ir->operands[0]->type;
+	 for (c = 0; c < ir->operands[0]->type->components(); c++) {
+	    switch (ir->operands[0]->type->base_type) {
+	    case GLSL_TYPE_UINT:
+	       u[c] = op[0]->value.u[c] / op[1]->value.u[c];
+	       break;
+	    case GLSL_TYPE_INT:
+	       i[c] = op[0]->value.i[c] / op[1]->value.i[c];
+	       break;
+	    case GLSL_TYPE_FLOAT:
+	       f[c] = op[0]->value.f[c] / op[1]->value.f[c];
+	       break;
+	    default:
+	       assert(0);
+	    }
+	 }
+      }
+      break;
    case ir_binop_logic_and:
       type = ir->operands[0]->type;
       assert(type->base_type == GLSL_TYPE_BOOL);
       for (c = 0; c < ir->operands[0]->type->components(); c++)
 	 b[c] = op[0]->value.b[c] && op[1]->value.b[c];
       break;
+   case ir_binop_logic_xor:
+      type = ir->operands[0]->type;
+      assert(type->base_type == GLSL_TYPE_BOOL);
+      for (c = 0; c < ir->operands[0]->type->components(); c++)
+	 b[c] = op[0]->value.b[c] ^ op[1]->value.b[c];
+      break;
    case ir_binop_logic_or:
       type = ir->operands[0]->type;
       assert(type->base_type == GLSL_TYPE_BOOL);