From: Chad Versace <chad.versace@linux.intel.com>
Date: Tue, 15 Jan 2013 20:16:12 +0000 (-0800)
Subject: glsl: Fix type-deduction for and/or/xor expressions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d7931ddf06bd41f1b1a589503cd028ff00d134e;p=mesa.git

glsl: Fix type-deduction for and/or/xor expressions

In ir_expression's constructor, the cases for {bit,logic}_{and,or,xor}
failed to handle the case when both operands were vectors.

Note: This is a candidate for the stable branches.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
---

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index bb02df37bf1..49ee2fe9ef4 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -378,10 +378,15 @@ ir_expression::ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1)
    case ir_binop_bit_and:
    case ir_binop_bit_xor:
    case ir_binop_bit_or:
+       assert(!op0->type->is_matrix());
+       assert(!op1->type->is_matrix());
       if (op0->type->is_scalar()) {
          this->type = op1->type;
       } else if (op1->type->is_scalar()) {
          this->type = op0->type;
+      } else {
+          assert(op0->type->vector_elements == op1->type->vector_elements);
+          this->type = op0->type;
       }
       break;