glsl: Don't support integer types for operations that can't handle them

ir_unop_fract already forbade integer types in ir_validate.  ir_unop_rcp,
ir_unop_rsq, and ir_unop_sqrt should also forbid them in ir_validate.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/compiler/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp
index 2d7895e471f8a13afb6b151099a8aa8c426603c5..6f9d18dd471030d9250858d706f26dcecde416a9 100644 (file)
--- a/src/compiler/glsl/ir_constant_expression.cpp
+++ b/src/compiler/glsl/ir_constant_expression.cpp
@@ -729,12 +729,6 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
    case ir_unop_fract:
       for (unsigned c = 0; c < op[0]->type->components(); c++) {
          switch (this->type->base_type) {
-         case GLSL_TYPE_UINT:
-            data.u[c] = 0;
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = 0;
-            break;
          case GLSL_TYPE_FLOAT:
             data.f[c] = op[0]->value.f[c] - floor(op[0]->value.f[c]);
             break;
@@ -823,14 +817,6 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
    case ir_unop_rcp:
       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];
-            break;
-         case GLSL_TYPE_INT:
-            if (op[0]->value.i[c] != 0.0)
-               data.i[c] = 1 / op[0]->value.i[c];
-            break;
          case GLSL_TYPE_FLOAT:
             if (op[0]->value.f[c] != 0.0)
                data.f[c] = 1.0F / op[0]->value.f[c];

diff --git a/src/compiler/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp
index 3ded20299062a656566e65ccf434f0749849c2a7..7e294f9f4dbfd9e1b0c7f0fbf784fbd717dea99b 100644 (file)
--- a/src/compiler/glsl/ir_validate.cpp
+++ b/src/compiler/glsl/ir_validate.cpp
@@ -260,6 +260,8 @@ ir_validate::visit_leave(ir_expression *ir)
    case ir_unop_rcp:
    case ir_unop_rsq:
    case ir_unop_sqrt:
+      assert(ir->type->base_type == GLSL_TYPE_FLOAT ||
+             ir->type->base_type == GLSL_TYPE_DOUBLE);
       assert(ir->type == ir->operands[0]->type);
       break;