Module: Mesa Branch: master Commit: 336e76c1439823185d425ebecb849ce38d55c4eb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=336e76c1439823185d425ebecb849ce38d55c4eb
Author: Matt Turner <[email protected]> Date: Fri Oct 31 10:33:17 2014 -0700 glsl: Emit mul instead of dot if only one component left. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85683 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85691 Reviewed-by: Ian Romanick <[email protected]> --- src/glsl/opt_algebraic.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/glsl/opt_algebraic.cpp b/src/glsl/opt_algebraic.cpp index c8d1ba1..a2d7e49 100644 --- a/src/glsl/opt_algebraic.cpp +++ b/src/glsl/opt_algebraic.cpp @@ -572,9 +572,12 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir) if (count >= op_const[i]->type->vector_elements) break; + ir_expression_operation op = count == 1 ? + ir_binop_mul : ir_binop_dot; + /* Swizzle both operands to remove the channels that were zero. */ return new(mem_ctx) - ir_expression(ir_binop_dot, glsl_type::float_type, + ir_expression(op, glsl_type::float_type, new(mem_ctx) ir_swizzle(ir->operands[0], components, count), new(mem_ctx) ir_swizzle(ir->operands[1], _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
