[PATCH 2/2] etnaviv: fix blend mode adjustment for component alpha

Lucas Stach l.stach at pengutronix.de
Tue Dec 13 19:20:51 UTC 2016


Set the correct fields for the blendmode, as otherwise the old blend
mode in those fields is still OR'ed into the final register value
after the adjustment.

Fixes: 3080f6afb5ae (etnaviv: split blend modes from the alpha mode)
Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
---
 etnaviv/etnaviv_render.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etnaviv/etnaviv_render.c b/etnaviv/etnaviv_render.c
index a46c1bb8f72b..c3d260834574 100644
--- a/etnaviv/etnaviv_render.c
+++ b/etnaviv/etnaviv_render.c
@@ -643,9 +643,9 @@ static int etnaviv_accel_composite_masked(PicturePtr pSrc, PicturePtr pMask,
 		/* Adjust the mask blend (InReverse) to perform the blend. */
 		mask_op.alpha_mode =
 			VIVS_DE_ALPHA_MODES_GLOBAL_SRC_ALPHA_MODE_NORMAL |
-			VIVS_DE_ALPHA_MODES_GLOBAL_DST_ALPHA_MODE_NORMAL |
-			VIVS_DE_ALPHA_MODES_SRC_BLENDING_MODE(DE_BLENDMODE_ZERO) |
-			VIVS_DE_ALPHA_MODES_DST_BLENDING_MODE(DE_BLENDMODE_COLOR);
+			VIVS_DE_ALPHA_MODES_GLOBAL_DST_ALPHA_MODE_NORMAL;
+		mask_op.src_mode = DE_BLENDMODE_ZERO;
+		mask_op.dst_mode = DE_BLENDMODE_COLOR;
 	}
 
 	if (pMask->pDrawable) {
-- 
2.10.2



More information about the etnaviv mailing list