Module: Mesa Branch: master Commit: 9697f8088f9e1c1b1f1b39b57a26ac4bd21b247f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9697f8088f9e1c1b1f1b39b57a26ac4bd21b247f
Author: Kenneth Graunke <[email protected]> Date: Tue Jul 15 16:34:56 2014 -0700 glsl: Make the tree rebalancer bail on matrix operands. It doesn't handle things like (vector * matrix) correctly, and apparently Matt's intention was to bail. Fixes shader compilation in Natural Selection 2. Signed-off-by: Kenneth Graunke <[email protected]> --- src/glsl/opt_rebalance_tree.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/glsl/opt_rebalance_tree.cpp b/src/glsl/opt_rebalance_tree.cpp index daabdc9..7ef0d2d 100644 --- a/src/glsl/opt_rebalance_tree.cpp +++ b/src/glsl/opt_rebalance_tree.cpp @@ -217,7 +217,9 @@ is_reduction(ir_instruction *ir, void *data) * constant fold once split up. Handling matrices will need some more * work. */ - if (expr->type->is_matrix()) { + if (expr->type->is_matrix() || + expr->operands[0]->type->is_matrix() || + (expr->operands[1] && expr->operands[1]->type->is_matrix())) { ird->is_reduction = false; return; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
