diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2015-06-15 19:05:59 +0100 |
|---|---|---|
| committer | Russell King <rmk@arm.linux.org.uk> | 2015-06-29 12:58:36 +0100 |
| commit | 69dc13ab9042f51001d048f01bf2fa11b389ba30 (patch) | |
| tree | ef2c3daadd2b0c03327d2d742ebd0e50d74c57ef | |
| parent | 3aa8eba19ea7438a4c41aa39dd657bab29dd3f8b (diff) | |
etnaviv: clean up usage of vTemp in etnaviv_accel_composite_masked()
We should be using vSrc, since that's what etnaviv_acquire_src()
returned to us, even though it's the same as vTemp.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| -rw-r--r-- | etnaviv/etnaviv_accel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etnaviv/etnaviv_accel.c b/etnaviv/etnaviv_accel.c index efcac5f..c1217fd 100644 --- a/etnaviv/etnaviv_accel.c +++ b/etnaviv/etnaviv_accel.c @@ -1525,7 +1525,7 @@ static int etnaviv_accel_composite_masked(PicturePtr pSrc, PicturePtr pMask, { ScreenPtr pScreen = pDst->pDrawable->pScreen; struct etnaviv *etnaviv = etnaviv_get_screen_priv(pScreen); - struct etnaviv_pixmap *vDst, *vSrc, *vMask, *vTemp = NULL; + struct etnaviv_pixmap *vDst, *vSrc, *vMask, *vTemp; struct etnaviv_blend_op mask_op; BoxRec clip_temp; xPoint src_topleft, dst_offset, mask_offset; @@ -1633,7 +1633,7 @@ static int etnaviv_accel_composite_masked(PicturePtr pSrc, PicturePtr pMask, * Blend the source (in the temporary pixmap) with the mask * via a InReverse op. */ - if (!etnaviv_blend(etnaviv, &clip_temp, &mask_op, vTemp, vMask, + if (!etnaviv_blend(etnaviv, &clip_temp, &mask_op, vSrc, vMask, &clip_temp, 1, mask_offset, ZERO_OFFSET)) return FALSE; @@ -1644,10 +1644,10 @@ finish: src_topleft.y = -(yDst + dst_offset.y); if (!gal_prepare_gpu(etnaviv, vDst, GPU_ACCESS_RW) || - !gal_prepare_gpu(etnaviv, vTemp, GPU_ACCESS_RO)) + !gal_prepare_gpu(etnaviv, vSrc, GPU_ACCESS_RO)) return FALSE; - final_op->src = INIT_BLIT_PIX(vTemp, vTemp->pict_format, src_topleft); + final_op->src = INIT_BLIT_PIX(vSrc, vSrc->pict_format, src_topleft); final_op->dst = INIT_BLIT_PIX(vDst, vDst->pict_format, dst_offset); return TRUE; |