Mesa (master): freedreno/a2xx: fix SRC_ALPHA_SATURATE for alpha blend function

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Sep 6 02:24:45 UTC 2019


Module: Mesa
Branch: master
Commit: ac4ca24c32bc4a1821790b5d2fdbf201680d3e67
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac4ca24c32bc4a1821790b5d2fdbf201680d3e67

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Wed Sep  4 22:36:00 2019 -0400

freedreno/a2xx: fix SRC_ALPHA_SATURATE for alpha blend function

Fixes failures in the following deqp tests:
dEQP-GLES2.functional.fragment_ops.*src_alpha_saturate*

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Rob Clark <robdclark at chromium.org>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/gallium/drivers/freedreno/a2xx/fd2_blend.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_blend.c b/src/gallium/drivers/freedreno/a2xx/fd2_blend.c
index 223eec9f592..8e03e840fcb 100644
--- a/src/gallium/drivers/freedreno/a2xx/fd2_blend.c
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_blend.c
@@ -83,8 +83,13 @@ fd2_blend_state_create(struct pipe_context *pctx,
 		A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN(blend_func(rt->rgb_func)) |
 		A2XX_RB_BLEND_CONTROL_COLOR_DESTBLEND(fd_blend_factor(rt->rgb_dst_factor));
 
+	/* hardware doesn't support SRC_ALPHA_SATURATE for alpha, but it is equivalent to ONE */
+	unsigned alpha_src_factor = rt->alpha_src_factor;
+	if (alpha_src_factor == PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE)
+		alpha_src_factor = PIPE_BLENDFACTOR_ONE;
+
 	so->rb_blendcontrol_alpha =
-		A2XX_RB_BLEND_CONTROL_ALPHA_SRCBLEND(fd_blend_factor(rt->alpha_src_factor)) |
+		A2XX_RB_BLEND_CONTROL_ALPHA_SRCBLEND(fd_blend_factor(alpha_src_factor)) |
 		A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN(blend_func(rt->alpha_func)) |
 		A2XX_RB_BLEND_CONTROL_ALPHA_DESTBLEND(fd_blend_factor(rt->alpha_dst_factor));
 




More information about the mesa-commit mailing list