From bb2cd98e512b9349c8b4dbc4a1959314fecbe6c7 Mon Sep 17 00:00:00 2001 From: Aras Pranckevicius Date: Tue, 30 Nov 2010 13:24:44 -0800 Subject: [PATCH] glsl: fix matrix type check in ir_algebraic Fixes glsl-mat-mul-1. (cherry picked from commit 4ce084c7072931732fba7ae1d73a4e4e20269f9d) --- src/glsl/ir_algebraic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glsl/ir_algebraic.cpp b/src/glsl/ir_algebraic.cpp index 2ed66db4765..323629a7805 100644 --- a/src/glsl/ir_algebraic.cpp +++ b/src/glsl/ir_algebraic.cpp @@ -187,8 +187,8 @@ ir_algebraic_visitor::reassociate_constant(ir_expression *ir1, int const_index, /* Don't want to even think about matrices. */ if (ir1->operands[0]->type->is_matrix() || - ir1->operands[0]->type->is_matrix() || - ir2->operands[1]->type->is_matrix() || + ir1->operands[1]->type->is_matrix() || + ir2->operands[0]->type->is_matrix() || ir2->operands[1]->type->is_matrix()) return false;