From 9d7931ddf06bd41f1b1a589503cd028ff00d134e Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Tue, 15 Jan 2013 12:16:12 -0800 Subject: [PATCH] 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 Signed-off-by: Chad Versace --- src/glsl/ir.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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; -- 2.30.2