ir_constant_expression: Support scalar / vector and scalar / matrix.

Fixes piglit tests const-vec-scalar-04.frag and const-mat-scalar-04.frag.
This commit is contained in:
Kenneth Graunke
2010-07-06 02:56:36 -07:00
committed by Ian Romanick
parent 97b44f040a
commit dad35eb8b0

View File

@@ -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: