KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <kenneth@whitecape.org>
This commit is contained in:
Kenneth Graunke 2014-07-15 16:36:32 -07:00
parent 7db75927ca
commit 9e47ed2f77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/glsl/opt_rebalance_tree.cpp
View File

@ -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;