Mesa (7.9): glsl: fix matrix type check in ir_algebraic

[Ian Romanick]

Module: Mesa
Branch: 7.9
Commit: bb2cd98e512b9349c8b4dbc4a1959314fecbe6c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb2cd98e512b9349c8b4dbc4a1959314fecbe6c7

Author: Aras Pranckevicius <aras at unity3d.com>
Date:   Tue Nov 30 13:24:44 2010 -0800

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 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glsl/ir_algebraic.cpp b/src/glsl/ir_algebraic.cpp
index 2ed66db..323629a 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;