diff options
author | Russell King <rmk@armlinux.org.uk> | 2016-11-25 23:43:06 +0000 |
---|---|---|
committer | Russell King <rmk@armlinux.org.uk> | 2016-11-25 23:43:06 +0000 |
commit | 760b2ac16aca5f7a3bc3a77a293de900c940d9ee (patch) | |
tree | 4217a5d338ffd50de78f1f57bd63903aa09ea630 | |
parent | b5b28c490fc7188064f94b85e5a384eceb13ecdb (diff) |
etnaviv: get rid of redundant 'op' argument to etnaviv_accel_reduce_mask()
We no longer need the 'op' argument, so get rid of it.
Signed-off-by: Russell King <rmk@armlinux.org.uk>
-rw-r--r-- | etnaviv/etnaviv_render.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etnaviv/etnaviv_render.c b/etnaviv/etnaviv_render.c index 5357108..5cf9e95 100644 --- a/etnaviv/etnaviv_render.c +++ b/etnaviv/etnaviv_render.c @@ -745,7 +745,7 @@ fallback: * GPU global alpha features. */ static Bool etnaviv_accel_reduce_mask(struct etnaviv_blend_op *final_blend, - CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst) + PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst) { uint32_t colour; uint32_t src_blend, dst_blend; @@ -1011,7 +1011,7 @@ static int etnaviv_accel_Composite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, if (op == PictOpClear) { /* Short-circuit for PictOpClear */ rc = etnaviv_Composite_Clear(pDst, &state); - } else if (!pMask || etnaviv_accel_reduce_mask(&state.final_blend, op, + } else if (!pMask || etnaviv_accel_reduce_mask(&state.final_blend, pSrc, pMask, pDst)) { rc = etnaviv_accel_composite_srconly(pSrc, pDst, xSrc, ySrc, |