summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2016-12-13 20:20:51 +0100
committerRussell King <rmk@armlinux.org.uk>2017-02-04 12:26:04 +0000
commitd58ad8ab68a5882da8a6fcb628bd491e975a8990 (patch)
treeb49f8033ac250705c0d906c671b86855c2ca659d
parent1bfe2e6254dd41e55f5662662d4e1f9cef979aa9 (diff)
etnaviv: fix blend mode adjustment for component alpha
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@pengutronix.de> Signed-off-by: Russell King <rmk@armlinux.org.uk>
-rw-r--r--etnaviv/etnaviv_render.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/etnaviv/etnaviv_render.c b/etnaviv/etnaviv_render.c
index a46c1bb..c3d2608 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) {