From: Aras Pranckevicius <aras@unity3d.com>
Date: Tue, 30 Nov 2010 21:24:44 +0000 (-0800)
Subject: glsl: fix matrix type check in ir_algebraic
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4ce084c7072931732fba7ae1d73a4e4e20269f9d;p=mesa.git

glsl: fix matrix type check in ir_algebraic

Fixes glsl-mat-mul-1.
---

diff --git a/src/glsl/opt_algebraic.cpp b/src/glsl/opt_algebraic.cpp
index 3c9af85f312..20f6159f0e6 100644
--- a/src/glsl/opt_algebraic.cpp
+++ b/src/glsl/opt_algebraic.cpp
@@ -123,8 +123,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;