From: Kenneth Graunke Date: Tue, 15 Jul 2014 23:36:32 +0000 (-0700) Subject: glsl: Make the tree rebalancer use vector_elements, not components(). X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e47ed2f77d8c274104cdcbc6b7c0c7334c50fdb;p=mesa.git glsl: Make the tree rebalancer use vector_elements, not components(). components() includes matrix columns, so if this code encountered a matrix, it would ask for something like a vec9 or vec16. This is clearly not what you want. Earlier code now prevents this from seeing matrices, but we should still use vector_elements, for clarity. Signed-off-by: Kenneth Graunke --- diff --git a/src/glsl/opt_rebalance_tree.cpp b/src/glsl/opt_rebalance_tree.cpp index f82b16b5412..095f2d7d2f0 100644 --- a/src/glsl/opt_rebalance_tree.cpp +++ b/src/glsl/opt_rebalance_tree.cpp @@ -273,8 +273,8 @@ update_types(ir_instruction *ir, void *) const glsl_type *const new_type = glsl_type::get_instance(expr->type->base_type, - MAX2(expr->operands[0]->type->components(), - expr->operands[1]->type->components()), + MAX2(expr->operands[0]->type->vector_elements, + expr->operands[1]->type->vector_elements), 1); assert(new_type != glsl_type::error_type); expr->type = new_type;