glsl: Use the generated constant expression code

Immediately previous to this patch,

    diff -wud src/glsl/ir_constant_expression.cpp \
              src/glsl/ir_expression_operation_constant.h

should be "minimal."

v3: With much help from José Fonseca, fix the SCons build.

Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Matt Turner <[email protected]>

4 files changed, 14 insertions, 1109 deletions

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index 125580dd945..b8225cbe206 100644
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -201,6 +201,10 @@ glsl/ir_expression_operation.h: glsl/ir_expression_operation.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py enum > $@ || ($(RM) $@; false)
 
+glsl/ir_expression_operation_constant.h: glsl/ir_expression_operation.py
+	$(MKDIR_GEN)
+	$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py constant > $@ || ($(RM) $@; false)
+
 glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false)
@@ -215,6 +219,7 @@ BUILT_SOURCES +=					\
 	glsl/glsl_parser.cpp				\
 	glsl/glsl_lexer.cpp				\
 	glsl/ir_expression_operation.h			\
+	glsl/ir_expression_operation_constant.h		\
 	glsl/ir_expression_operation_strings.h		\
 	glsl/glcpp/glcpp-parse.c			\
 	glsl/glcpp/glcpp-lex.c
@@ -224,6 +229,7 @@ CLEANFILES +=						\
 	glsl/glsl_parser.cpp				\
 	glsl/glsl_lexer.cpp				\
 	glsl/ir_expression_operation.h			\
+	glsl/ir_expression_operation_constant.h		\
 	glsl/ir_expression_operation_strings.h		\
 	glsl/glcpp/glcpp-parse.c			\
 	glsl/glcpp/glcpp-lex.c
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index 70f270c983b..f5b4f9c0b98 100644
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -147,6 +147,7 @@ GLSL_COMPILER_CXX_FILES = \
 # libglsl generated sources
 LIBGLSL_GENERATED_FILES = \
 	glsl/ir_expression_operation.h \
+	glsl/ir_expression_operation_constant.h \
 	glsl/ir_expression_operation_strings.h \
 	glsl/glsl_lexer.cpp \
 	glsl/glsl_parser.cpp \
diff --git a/src/compiler/SConscript.glsl b/src/compiler/SConscript.glsl
index b1b41693397..d9878a00945 100644
--- a/src/compiler/SConscript.glsl
+++ b/src/compiler/SConscript.glsl
@@ -124,7 +124,12 @@ env.CodeGenerate(
     source = [],
     command = python_cmd + ' $SCRIPT enum > $TARGET'
 )
-
+env.CodeGenerate(
+    target = 'glsl/ir_expression_operation_constant.h',
+    script = 'glsl/ir_expression_operation.py',
+    source = [],
+    command = python_cmd + ' $SCRIPT constant > $TARGET'
+)
 env.CodeGenerate(
     target = 'glsl/ir_expression_operation_strings.h',
     script = 'glsl/ir_expression_operation.py',
diff --git a/src/compiler/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp
index 311e20a193d..0e503f5d3cf 100644
--- a/src/compiler/glsl/ir_constant_expression.cpp
+++ b/src/compiler/glsl/ir_constant_expression.cpp
@@ -654,1114 +654,7 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
       return NULL;
    }
 
-   switch (this->operation) {
-   case ir_unop_bit_not:
-       switch (op[0]->type->base_type) {
-       case GLSL_TYPE_UINT:
-           for (unsigned c = 0; c < components; c++)
-               data.u[c] = ~ op[0]->value.u[c];
-           break;
-       case GLSL_TYPE_INT:
-           for (unsigned c = 0; c < components; c++)
-               data.i[c] = ~ op[0]->value.i[c];
-           break;
-       default:
-           assert(0);
-       }
-       break;
-
-   case ir_unop_logic_not:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-          data.b[c] = !op[0]->value.b[c];
-      break;
-
-   case ir_unop_neg:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         switch (this->type->base_type) {
-         case GLSL_TYPE_UINT:
-            data.u[c] = -((int) op[0]->value.u[c]);
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = -op[0]->value.i[c];
-            break;
-         case GLSL_TYPE_FLOAT:
-            data.f[c] = -op[0]->value.f[c];
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = -op[0]->value.d[c];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_unop_abs:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         switch (this->type->base_type) {
-         case GLSL_TYPE_INT:
-            data.i[c] = op[0]->value.i[c];
-            if (data.i[c] < 0)
-               data.i[c] = -data.i[c];
-            break;
-         case GLSL_TYPE_FLOAT:
-            data.f[c] = fabs(op[0]->value.f[c]);
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = fabs(op[0]->value.d[c]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_unop_sign:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         switch (this->type->base_type) {
-         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.0F) - (op[0]->value.f[c] < 0.0F));
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = double((op[0]->value.d[c] > 0.0) - (op[0]->value.d[c] < 0.0));
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_unop_rcp:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         switch (this->type->base_type) {
-         case GLSL_TYPE_FLOAT:
-            if (op[0]->value.f[c] != 0.0F)
-               data.f[c] = 1.0F / op[0]->value.f[c];
-            break;
-         case GLSL_TYPE_DOUBLE:
-            if (op[0]->value.d[c] != 0.0)
-               data.d[c] = 1.0 / op[0]->value.d[c];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_unop_rsq:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = 1.0 / sqrt(op[0]->value.d[c]);
-         else
-            data.f[c] = 1.0F / sqrtf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_sqrt:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = sqrt(op[0]->value.d[c]);
-         else
-            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 < op[0]->type->components(); c++)
-         data.f[c] = expf(op[0]->value.f[c]);
-      break;
-
-   case ir_unop_log:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.f[c] = logf(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_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_f2i:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.i[c] = (int) op[0]->value.f[c];
-      break;
-
-   case ir_unop_f2u:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.u[c] = (unsigned) op[0]->value.f[c];
-      break;
-
-   case ir_unop_i2f:
-      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_f2b:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      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_b2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      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_i2b:
-      assert(op[0]->type->is_integer());
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.b[c] = op[0]->value.u[c] ? true : false;
-      break;
-
-   case ir_unop_b2i:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.i[c] = op[0]->value.b[c] ? 1 : 0;
-      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_i2u:
-      assert(op[0]->type->base_type == GLSL_TYPE_INT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.u[c] = op[0]->value.i[c];
-      break;
-
-   case ir_unop_u2i:
-      assert(op[0]->type->base_type == GLSL_TYPE_UINT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.i[c] = op[0]->value.u[c];
-      break;
-
-   case ir_unop_d2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_DOUBLE);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.f[c] = op[0]->value.d[c];
-      break;
-
-   case ir_unop_f2d:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.d[c] = op[0]->value.f[c];
-      break;
-
-   case ir_unop_d2i:
-      assert(op[0]->type->base_type == GLSL_TYPE_DOUBLE);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.i[c] = op[0]->value.d[c];
-      break;
-
-   case ir_unop_i2d:
-      assert(op[0]->type->base_type == GLSL_TYPE_INT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.d[c] = op[0]->value.i[c];
-      break;
-
-   case ir_unop_d2u:
-      assert(op[0]->type->base_type == GLSL_TYPE_DOUBLE);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.u[c] = op[0]->value.d[c];
-      break;
-
-   case ir_unop_u2d:
-      assert(op[0]->type->base_type == GLSL_TYPE_UINT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.d[c] = op[0]->value.u[c];
-      break;
-
-   case ir_unop_d2b:
-      assert(op[0]->type->base_type == GLSL_TYPE_DOUBLE);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.b[c] = op[0]->value.d[c] != 0.0;
-      break;
-
-   case ir_unop_bitcast_i2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_INT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.f[c] = bitcast_u2f(op[0]->value.i[c]);
-      break;
-
-   case ir_unop_bitcast_f2i:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.i[c] = bitcast_f2u(op[0]->value.f[c]);
-      break;
-
-   case ir_unop_bitcast_u2f:
-      assert(op[0]->type->base_type == GLSL_TYPE_UINT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.f[c] = bitcast_u2f(op[0]->value.u[c]);
-      break;
-
-   case ir_unop_bitcast_f2u:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.u[c] = bitcast_f2u(op[0]->value.f[c]);
-      break;
-
-   case ir_unop_trunc:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = trunc(op[0]->value.d[c]);
-         else
-            data.f[c] = truncf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_ceil:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = ceil(op[0]->value.d[c]);
-         else
-            data.f[c] = ceilf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_floor:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = floor(op[0]->value.d[c]);
-         else
-            data.f[c] = floorf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_fract:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         switch (this->type->base_type) {
-         case GLSL_TYPE_FLOAT:
-            data.f[c] = op[0]->value.f[c] - floorf(op[0]->value.f[c]);
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = op[0]->value.d[c] - floor(op[0]->value.d[c]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_unop_round_even:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = _mesa_roundeven(op[0]->value.d[c]);
-         else
-            data.f[c] = _mesa_roundevenf(op[0]->value.f[c]);
-      }
-      break;
-
-   case ir_unop_sin:
-      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:
-      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_dFdx:
-   case ir_unop_dFdx_coarse:
-   case ir_unop_dFdx_fine:
-   case ir_unop_dFdy:
-   case ir_unop_dFdy_coarse:
-   case ir_unop_dFdy_fine:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.f[c] = 0.0F;
-      break;
-
-   case ir_unop_pack_snorm_2x16:
-      assert(op[0]->type == glsl_type::vec2_type);
-      data.u[0] = pack_2x16(pack_snorm_1x16, op[0]->value.f[0], op[0]->value.f[1]);
-      break;
-
-   case ir_unop_pack_snorm_4x8:
-      assert(op[0]->type == glsl_type::vec4_type);
-      data.u[0] = pack_4x8(pack_snorm_1x8, op[0]->value.f[0], op[0]->value.f[1], op[0]->value.f[2], op[0]->value.f[3]);
-      break;
-
-   case ir_unop_pack_unorm_2x16:
-      assert(op[0]->type == glsl_type::vec2_type);
-      data.u[0] = pack_2x16(pack_unorm_1x16, op[0]->value.f[0], op[0]->value.f[1]);
-      break;
-
-   case ir_unop_pack_unorm_4x8:
-      assert(op[0]->type == glsl_type::vec4_type);
-      data.u[0] = pack_4x8(pack_unorm_1x8, op[0]->value.f[0], op[0]->value.f[1], op[0]->value.f[2], op[0]->value.f[3]);
-      break;
-
-   case ir_unop_pack_half_2x16:
-      assert(op[0]->type == glsl_type::vec2_type);
-      data.u[0] = pack_2x16(pack_half_1x16, op[0]->value.f[0], op[0]->value.f[1]);
-      break;
-
-   case ir_unop_unpack_snorm_2x16:
-      assert(op[0]->type == glsl_type::uint_type);
-      unpack_2x16(unpack_snorm_1x16, op[0]->value.u[0], &data.f[0], &data.f[1]);
-      break;
-
-   case ir_unop_unpack_snorm_4x8:
-      assert(op[0]->type == glsl_type::uint_type);
-      unpack_4x8(unpack_snorm_1x8, op[0]->value.u[0], &data.f[0], &data.f[1], &data.f[2], &data.f[3]);
-      break;
-
-   case ir_unop_unpack_unorm_2x16:
-      assert(op[0]->type == glsl_type::uint_type);
-      unpack_2x16(unpack_unorm_1x16, op[0]->value.u[0], &data.f[0], &data.f[1]);
-      break;
-
-   case ir_unop_unpack_unorm_4x8:
-      assert(op[0]->type == glsl_type::uint_type);
-      unpack_4x8(unpack_unorm_1x8, op[0]->value.u[0], &data.f[0], &data.f[1], &data.f[2], &data.f[3]);
-      break;
-
-   case ir_unop_unpack_half_2x16:
-      assert(op[0]->type == glsl_type::uint_type);
-      unpack_2x16(unpack_half_1x16, op[0]->value.u[0], &data.f[0], &data.f[1]);
-      break;
-
-   case ir_unop_bitfield_reverse:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         switch (this->type->base_type) {
-         case GLSL_TYPE_UINT:
-            data.u[c] = bitfield_reverse(op[0]->value.u[c]);
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = bitfield_reverse(op[0]->value.i[c]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_unop_bit_count:
-      for (unsigned c = 0; c < components; c++)
-         data.i[c] = _mesa_bitcount(op[0]->value.u[c]);
-      break;
-
-   case ir_unop_find_msb:
-      for (unsigned c = 0; c < components; c++) {
-         switch (op[0]->type->base_type) {
-         case GLSL_TYPE_UINT:
-            data.i[c] = find_msb_uint(op[0]->value.u[c]);
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = find_msb_int(op[0]->value.i[c]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_unop_find_lsb:
-      for (unsigned c = 0; c < components; c++) {
-         switch (op[0]->type->base_type) {
-         case GLSL_TYPE_UINT:
-            data.i[c] = find_msb_uint(op[0]->value.u[c] & -op[0]->value.u[c]);
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = find_msb_uint(op[0]->value.i[c] & -op[0]->value.i[c]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_unop_saturate:
-      for (unsigned c = 0; c < components; c++)
-         data.f[c] = CLAMP(op[0]->value.f[c], 0.0f, 1.0f);
-      break;
-
-   case ir_unop_pack_double_2x32:
-      /* XXX needs to be checked on big-endian */
-      memcpy(&data.d[0], &op[0]->value.u[0], sizeof(double));
-      break;
-
-   case ir_unop_unpack_double_2x32:
-      /* XXX needs to be checked on big-endian */
-      memcpy(&data.u[0], &op[0]->value.d[0], sizeof(double));
-      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 (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:
-            data.f[c] = op[0]->value.f[c0] + op[1]->value.f[c1];
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = op[0]->value.d[c0] + op[1]->value.d[c1];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_sub:
-      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:
-            data.f[c] = op[0]->value.f[c0] - op[1]->value.f[c1];
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = op[0]->value.d[c0] - op[1]->value.d[c1];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_mul:
-      /* Check for equal types, or unequal types involving scalars */
-      if ((op[0]->type == op[1]->type && !op[0]->type->is_matrix())
-          || 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:
-               data.f[c] = op[0]->value.f[c0] * op[1]->value.f[c1];
-               break;
-            case GLSL_TYPE_DOUBLE:
-               data.d[c] = op[0]->value.d[c0] * op[1]->value.d[c1];
-               break;
-            default:
-               assert(0);
-            }
-         }
-      } else {
-         assert(op[0]->type->is_matrix() || op[1]->type->is_matrix());
-
-         /* Multiply an N-by-M matrix with an M-by-P matrix.  Since either
-          * matrix can be a GLSL vector, either N or P can be 1.
-          *
-          * For vec*mat, the vector is treated as a row vector.  This
-          * means the vector is a 1-row x M-column matrix.
-          *
-          * For mat*vec, the vector is treated as a column vector.  Since
-          * matrix_columns is 1 for vectors, this just works.
-          */
-         const unsigned n = op[0]->type->is_vector()
-            ? 1 : op[0]->type->vector_elements;
-         const unsigned m = op[1]->type->vector_elements;
-         const unsigned p = op[1]->type->matrix_columns;
-         for (unsigned j = 0; j < p; j++) {
-            for (unsigned i = 0; i < n; i++) {
-               for (unsigned k = 0; k < m; k++) {
-                  if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-                     data.d[i+n*j] += op[0]->value.d[i+n*k]*op[1]->value.d[k+m*j];
-                  else
-                     data.f[i+n*j] += op[0]->value.f[i+n*k]*op[1]->value.f[k+m*j];
-               }
-            }
-         }
-      }
-      break;
-
-   case ir_binop_div:
-      /* FINISHME: Emit warning when division-by-zero is detected. */
-      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[1]->value.u[c1] == 0 ? 0 : op[0]->value.u[c0] / op[1]->value.u[c1];
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = op[1]->value.i[c1] == 0 ? 0 : op[0]->value.i[c0] / op[1]->value.i[c1];
-            break;
-         case GLSL_TYPE_FLOAT:
-            data.f[c] = op[0]->value.f[c0] / op[1]->value.f[c1];
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = op[0]->value.d[c0] / op[1]->value.d[c1];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_mod:
-      /* FINISHME: Emit warning when division-by-zero is detected. */
-      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[1]->value.u[c1] == 0 ? 0 : op[0]->value.u[c0] % op[1]->value.u[c1];
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = op[1]->value.i[c1] == 0 ? 0 : 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;
-         case GLSL_TYPE_DOUBLE:
-            /* We don't use fmod because it rounds toward zero; GLSL specifies
-             * the use of floor.
-             */
-            data.d[c] = op[0]->value.d[c0] - op[1]->value.d[c1] * floor(op[0]->value.d[c0] / op[1]->value.d[c1]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_less:
-      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;
-         case GLSL_TYPE_DOUBLE:
-            data.b[c] = op[0]->value.d[c] < op[1]->value.d[c];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_greater:
-      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;
-         case GLSL_TYPE_DOUBLE:
-            data.b[c] = op[0]->value.d[c] > op[1]->value.d[c];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_lequal:
-      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;
-         case GLSL_TYPE_DOUBLE:
-            data.b[c] = op[0]->value.d[c] <= op[1]->value.d[c];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_gequal:
-      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;
-         case GLSL_TYPE_DOUBLE:
-            data.b[c] = op[0]->value.d[c] >= op[1]->value.d[c];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_equal:
-      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[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_DOUBLE:
-            data.b[c] = op[0]->value.d[c] == op[1]->value.d[c];
-            break;
-         case GLSL_TYPE_BOOL:
-            data.b[c] = op[0]->value.b[c] == op[1]->value.b[c];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_nequal:
-      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[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_DOUBLE:
-            data.b[c] = op[0]->value.d[c] != op[1]->value.d[c];
-            break;
-         case GLSL_TYPE_BOOL:
-            data.b[c] = op[0]->value.b[c] != op[1]->value.b[c];
-            break;
-         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_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;
-          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_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;
-          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_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;
-          default:
-              assert(0);
-          }
-      }
-      break;
-
-   case ir_binop_logic_and:
-      assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
-      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 < 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 < op[0]->type->components(); c++)
-         data.b[c] = op[0]->value.b[c] || op[1]->value.b[c];
-      break;
-
-   case ir_binop_dot:
-      if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-         data.d[0] = dot_d(op[0], op[1]);
-      else
-         data.f[0] = dot_f(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[c] = MIN2(op[0]->value.u[c0], op[1]->value.u[c1]);
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = MIN2(op[0]->value.i[c0], op[1]->value.i[c1]);
-            break;
-         case GLSL_TYPE_FLOAT:
-            data.f[c] = MIN2(op[0]->value.f[c0], op[1]->value.f[c1]);
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = MIN2(op[0]->value.d[c0], op[1]->value.d[c1]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      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;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = MAX2(op[0]->value.d[c0], op[1]->value.d[c1]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_pow:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
-      for (unsigned c = 0; c < op[0]->type->components(); c++)
-         data.f[c] = powf(op[0]->value.f[c], op[1]->value.f[c]);
-      break;
-
-   case ir_binop_ldexp:
-      for (unsigned c = 0; c < op[0]->type->components(); c++) {
-         switch (this->type->base_type) {
-         case GLSL_TYPE_FLOAT:
-            data.f[c] = ldexpf_flush_subnormal(op[0]->value.f[c], op[1]->value.i[c]);
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = ldexp_flush_subnormal(op[0]->value.d[c], op[1]->value.i[c]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_binop_vector_extract: {
-      const int c = CLAMP(op[1]->value.i[0], 0,
-                          (int) op[0]->type->vector_elements - 1);
-
-      switch (op[0]->type->base_type) {
-      case GLSL_TYPE_UINT:
-         data.u[0] = op[0]->value.u[c];
-         break;
-      case GLSL_TYPE_INT:
-         data.i[0] = op[0]->value.i[c];
-         break;
-      case GLSL_TYPE_FLOAT:
-         data.f[0] = op[0]->value.f[c];
-         break;
-      case GLSL_TYPE_DOUBLE:
-         data.d[0] = op[0]->value.d[c];
-         break;
-      case GLSL_TYPE_BOOL:
-         data.b[0] = op[0]->value.b[c];
-         break;
-      default:
-         assert(0);
-      }
-      break;
-   }
-
-   case ir_triop_fma:
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT ||
-             op[0]->type->base_type == GLSL_TYPE_DOUBLE);
-      assert(op[1]->type->base_type == GLSL_TYPE_FLOAT ||
-             op[1]->type->base_type == GLSL_TYPE_DOUBLE);
-      assert(op[2]->type->base_type == GLSL_TYPE_FLOAT ||
-             op[2]->type->base_type == GLSL_TYPE_DOUBLE);
-
-      for (unsigned c = 0; c < components; c++) {
-         if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = op[0]->value.d[c] * op[1]->value.d[c] + op[2]->value.d[c];
-         else
-            data.f[c] = op[0]->value.f[c] * op[1]->value.f[c] + op[2]->value.f[c];
-      }
-      break;
-
-   case ir_triop_lrp: {
-      assert(op[0]->type->base_type == GLSL_TYPE_FLOAT ||
-             op[0]->type->base_type == GLSL_TYPE_DOUBLE);
-      assert(op[1]->type->base_type == GLSL_TYPE_FLOAT ||
-             op[1]->type->base_type == GLSL_TYPE_DOUBLE);
-      assert(op[2]->type->base_type == GLSL_TYPE_FLOAT ||
-             op[2]->type->base_type == GLSL_TYPE_DOUBLE);
-
-      unsigned c2_inc = op[2]->type->is_scalar() ? 0 : 1;
-      for (unsigned c = 0, c2 = 0; c < components; c2 += c2_inc, c++) {
-         if (op[0]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = op[0]->value.d[c] * (1.0 - op[2]->value.d[c2]) + (op[1]->value.d[c] * op[2]->value.d[c2]);
-         else
-            data.f[c] = op[0]->value.f[c] * (1.0f - op[2]->value.f[c2]) + (op[1]->value.f[c] * op[2]->value.f[c2]);
-      }
-      break;
-   }
-
-   case ir_triop_csel:
-      for (unsigned c = 0; c < components; c++) {
-         if (op[1]->type->base_type == GLSL_TYPE_DOUBLE)
-            data.d[c] = op[0]->value.b[c] ? op[1]->value.d[c]
-                                       : op[2]->value.d[c];
-         else
-            data.u[c] = op[0]->value.b[c] ? op[1]->value.u[c]
-                                       : op[2]->value.u[c];
-      }
-      break;
-
-   case ir_triop_bitfield_extract:
-      for (unsigned c = 0; c < components; c++) {
-         switch (this->type->base_type) {
-         case GLSL_TYPE_UINT:
-            data.u[c] = bitfield_extract_uint(op[0]->value.u[c], op[1]->value.i[c], op[2]->value.i[c]);
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = bitfield_extract_int(op[0]->value.i[c], op[1]->value.i[c], op[2]->value.i[c]);
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   case ir_triop_vector_insert: {
-      const unsigned idx = op[2]->value.u[0];
-
-      memcpy(&data, &op[0]->value, sizeof(data));
-
-      switch (this->type->base_type) {
-      case GLSL_TYPE_UINT:
-         data.u[idx] = op[1]->value.u[0];
-         break;
-      case GLSL_TYPE_INT:
-         data.i[idx] = op[1]->value.i[0];
-         break;
-      case GLSL_TYPE_FLOAT:
-         data.f[idx] = op[1]->value.f[0];
-         break;
-      case GLSL_TYPE_DOUBLE:
-         data.d[idx] = op[1]->value.d[0];
-         break;
-      case GLSL_TYPE_BOOL:
-         data.b[idx] = op[1]->value.b[0];
-         break;
-      default:
-         assert(!"Should not get here.");
-         break;
-      }
-      break;
-   }
-
-   case ir_quadop_bitfield_insert:
-      for (unsigned c = 0; c < components; c++)
-         data.u[c] = bitfield_insert(op[0]->value.u[c], op[1]->value.u[c], op[2]->value.i[c], op[3]->value.i[c]);
-      break;
-
-   case ir_quadop_vector:
-      for (unsigned c = 0; c < this->type->vector_elements; c++) {
-         switch (this->type->base_type) {
-         case GLSL_TYPE_UINT:
-            data.u[c] = op[c]->value.u[0];
-            break;
-         case GLSL_TYPE_INT:
-            data.i[c] = op[c]->value.i[0];
-            break;
-         case GLSL_TYPE_FLOAT:
-            data.f[c] = op[c]->value.f[0];
-            break;
-         case GLSL_TYPE_DOUBLE:
-            data.d[c] = op[c]->value.d[0];
-            break;
-         case GLSL_TYPE_BOOL:
-            data.b[c] = op[c]->value.b[0];
-            break;
-         default:
-            assert(0);
-         }
-      }
-      break;
-
-   default:
-      /* FINISHME: Should handle all expression types. */
-      return NULL;
-   }
+#include "ir_expression_operation_constant.h"
 
    return new(ctx) ir_constant(this->type, &data);
 }