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

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 4ce084c7072931732fba7ae1d73a4e4e20269f9d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ce084c7072931732fba7ae1d73a4e4e20269f9d

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.

---

 src/glsl/opt_algebraic.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glsl/opt_algebraic.cpp b/src/glsl/opt_algebraic.cpp
index 3c9af85..20f6159 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;