From cf2dc1624fe711ad0aa89322a1142eae46bbfc30 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 27 Mar 2015 10:45:07 -0700 Subject: [PATCH] glsl: Implement type inferencing of matrix types. Reviewed-by: Chris Forbes --- src/glsl/ir.cpp | 10 ++++++---- 1 file 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; -- 2.30.2