summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2015-03-27 10:45:07 -0700
committerMatt Turner <[email protected]>2015-03-31 14:01:15 -0700
commitcf2dc1624fe711ad0aa89322a1142eae46bbfc30 (patch)
treea8784e74a2d8bda927b716c30720e3bf127abb07
parent73f6f9b9be1aedf85cfe15b87e3c543e5cc399d2 (diff)
glsl: Implement type inferencing of matrix types.
Reviewed-by: Chris Forbes <[email protected]>
-rw-r--r--src/glsl/ir.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 54656f89933..4b8ca9b0f85 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -380,10 +380,12 @@ ir_expression::ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1)
} else if (op1->type->is_scalar()) {
this->type = op0->type;
} else {
- /* FINISHME: matrix types */
- assert(!op0->type->is_matrix() && !op1->type->is_matrix());
- assert(op0->type == op1->type);
- this->type = op0->type;
+ if (this->operation == ir_binop_mul) {
+ this->type = glsl_type::get_mul_type(op0->type, op1->type);
+ } else {
+ assert(op0->type == op1->type);
+ this->type = op0->type;
+ }
}
break;