Add float/int conversion to ir_constant_expression.cpp.

Gives CorrectParse2.frag one more constant folding.

1 files changed, 20 insertions, 0 deletions

diff --git a/ir_constant_expression.cpp b/ir_constant_expression.cpp
index 9c98ceb66c..e1073cde1c 100644
--- a/ir_constant_expression.cpp
+++ b/ir_constant_expression.cpp
@@ -153,6 +153,26 @@ ir_constant_visitor::visit(ir_expression *ir)
       for (c = 0; c < ir->operands[0]->type->components(); c++)
 	 b[c] = !op[0]->value.b[c];
       break;
+
+   case ir_unop_f2i:
+      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+      type = ir->type;
+      for (c = 0; c < ir->operands[0]->type->components(); c++) {
+	 i[c] = 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);
+      type = ir->type;
+      for (c = 0; c < ir->operands[0]->type->components(); c++) {
+	 if (op[0]->type->base_type == GLSL_TYPE_INT)
+	    f[c] = op[0]->value.i[c];
+	 else
+	    f[c] = op[0]->value.u[c];
+      }
+      break;
+
    case ir_binop_add:
       if (ir->operands[0]->type == ir->operands[1]->type) {
 	 type = ir->operands[0]->type;