From 089bc22de530a1ff251bb1e809f77de9cd578142 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 20 Aug 2020 11:45:53 -0400 Subject: [PATCH] r300: Use util_blend_factor_uses_dest MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: Fix missing { and #include (trivial) Signed-off-by: Alyssa Rosenzweig Reviewed-by: Eric Anholt [v1] Reviewed-by: Marek Olšák [v1] Part-of: --- src/gallium/drivers/r300/r300_state.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 6396577f03c..2d8e5b1832a 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -30,6 +30,7 @@ #include "util/u_memory.h" #include "util/u_pack_color.h" #include "util/u_transfer.h" +#include "util/u_blend.h" #include "tgsi/tgsi_parse.h" @@ -284,15 +285,8 @@ static unsigned blend_read_enable(unsigned eqRGB, unsigned eqA, eqRGB == PIPE_BLEND_MAX || eqA == PIPE_BLEND_MAX || dstRGB != PIPE_BLENDFACTOR_ZERO || dstA != PIPE_BLENDFACTOR_ZERO || - srcRGB == PIPE_BLENDFACTOR_DST_COLOR || - srcRGB == PIPE_BLENDFACTOR_DST_ALPHA || - srcRGB == PIPE_BLENDFACTOR_INV_DST_COLOR || - srcRGB == PIPE_BLENDFACTOR_INV_DST_ALPHA || - srcA == PIPE_BLENDFACTOR_DST_COLOR || - srcA == PIPE_BLENDFACTOR_DST_ALPHA || - srcA == PIPE_BLENDFACTOR_INV_DST_COLOR || - srcA == PIPE_BLENDFACTOR_INV_DST_ALPHA || - srcRGB == PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE) { + util_blend_factor_uses_dest(srcRGB, false) || + util_blend_factor_uses_dest(srcA, true)) { /* Enable reading from the colorbuffer. */ blend_control |= R300_READ_ENABLE; -- 2.30.2