summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-07-06 02:56:36 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-07-06 16:03:33 -0700
commitdad35eb8b0c7378588d9dca1c1091aaede83a83f (patch)
tree7beb14686603f7e0c33e888127e3eadf1ad243ed
parent97b44f040abc9cbf257aba1b7fdaa11134dcc70b (diff)
ir_constant_expression: Support scalar / vector and scalar / matrix.
Fixes piglit tests const-vec-scalar-04.frag and const-mat-scalar-04.frag.
-rw-r--r--src/glsl/ir_constant_expression.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index fbf06f13255..2fab03bb60e 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -385,25 +385,25 @@ ir_constant_visitor::visit(ir_expression *ir)
break;
case ir_binop_div:
- if (ir->operands[0]->type == ir->operands[1]->type) {
- for (c = 0; c < ir->operands[0]->type->components(); c++) {
- switch (ir->operands[0]->type->base_type) {
- case GLSL_TYPE_UINT:
- data.u[c] = op[0]->value.u[c] / op[1]->value.u[c];
- break;
- case GLSL_TYPE_INT:
- data.i[c] = op[0]->value.i[c] / op[1]->value.i[c];
- break;
- case GLSL_TYPE_FLOAT:
- data.f[c] = op[0]->value.f[c] / op[1]->value.f[c];
- break;
- default:
- assert(0);
- }
+ 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 (ir->operands[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;
+ default:
+ assert(0);
}
- } else
- /* FINISHME: Support operations with non-equal types. */
- return;
+ }
break;
case ir_binop_logic_and: