summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
authorAras Pranckevicius <aras@unity3d.com>2010-11-30 13:24:44 -0800
committerEric Anholt <eric@anholt.net>2010-11-30 13:32:00 -0800
commit4ce084c7072931732fba7ae1d73a4e4e20269f9d (patch)
tree3db370db578813334f9006a3e44e117a87efa51e /src/glsl
parentd56c97413ee65e40e3544b89ffca450df9ba1c06 (diff)
glsl: fix matrix type check in ir_algebraic
Fixes glsl-mat-mul-1.
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/opt_algebraic.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/opt_algebraic.cpp b/src/glsl/opt_algebraic.cpp
index 3c9af85f31..20f6159f0e 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;