From e253175c9c8034bfc13ecc3e16ab72007bde744a Mon Sep 17 00:00:00 2001 From: James Benton Date: Tue, 17 Jul 2012 12:08:02 +0100 Subject: [PATCH] llvmpipe: Fix bug with blend factor in complementary optimisations. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes fdo 52168. Reviewed-by: José Fonseca --- src/gallium/drivers/llvmpipe/lp_bld_blend.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_bld_blend.c b/src/gallium/drivers/llvmpipe/lp_bld_blend.c index a87a220ea48..75309dd5fcd 100644 --- a/src/gallium/drivers/llvmpipe/lp_bld_blend.c +++ b/src/gallium/drivers/llvmpipe/lp_bld_blend.c @@ -152,20 +152,22 @@ lp_build_blend(struct lp_build_context *bld, } } else if(bld->type.floating && func == PIPE_BLEND_SUBTRACT) { result = lp_build_add(bld, src, dst); - result = lp_build_mul(bld, result, src_factor); if (factor_src < factor_dst) { + result = lp_build_mul(bld, result, src_factor); return lp_build_sub(bld, result, dst); } else { + result = lp_build_mul(bld, result, dst_factor); return lp_build_sub(bld, src, result); } } else if(bld->type.floating && func == PIPE_BLEND_REVERSE_SUBTRACT) { result = lp_build_add(bld, src, dst); - result = lp_build_mul(bld, result, src_factor); if (factor_src < factor_dst) { + result = lp_build_mul(bld, result, src_factor); return lp_build_sub(bld, dst, result); } else { + result = lp_build_mul(bld, result, dst_factor); return lp_build_sub(bld, result, src); } } -- 2.30.2