From: James Benton <jbenton@vmware.com>
Date: Tue, 17 Jul 2012 11:08:02 +0000 (+0100)
Subject: llvmpipe: Fix bug with blend factor in complementary optimisations.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e253175c9c8034bfc13ecc3e16ab72007bde744a;p=mesa.git

llvmpipe: Fix bug with blend factor in complementary optimisations.

Fixes fdo 52168.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
---

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);
             }
          }