Mesa (glsl2): ir_constant_expression: Add support for ir_unop_u2f.

[Kenneth Graunke]

Module: Mesa
Branch: glsl2
Commit: 46d6b8d1ba09d9d6844ce99a30416283004f77c6
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=46d6b8d1ba09d9d6844ce99a30416283004f77c6

Author: Kenneth Graunke <kenn...@whitecape.org>
Date:   Tue Jul 20 13:01:56 2010 -0700

ir_constant_expression: Add support for ir_unop_u2f.

Also make ir_unop_i2f only operate on signed integers.

---

 src/glsl/ir_constant_expression.cpp |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/glsl/ir_constant_expression.cpp 
b/src/glsl/ir_constant_expression.cpp
index b0333db..acfbb86 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -87,13 +87,15 @@ ir_expression::constant_expression_value()
       }
       break;
    case ir_unop_i2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_UINT ||
-            op[0]->type->base_type == GLSL_TYPE_INT);
+      assert(op[0]->type->base_type == GLSL_TYPE_INT);
       for (unsigned c = 0; c < op[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];
+        data.f[c] = 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] = op[0]->value.u[c];
       }
       break;
    case ir_unop_b2f:

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit