diff options
| author | Russell King <rmk@armlinux.org.uk> | 2016-11-24 17:00:29 +0000 |
|---|---|---|
| committer | Russell King <rmk@armlinux.org.uk> | 2016-11-24 17:20:01 +0000 |
| commit | a16ac0daf328d3fd671367c4a4648b9c71b5bb90 (patch) | |
| tree | 5d8b2c24fb5b5242f05b22c774521e3445d02d3f | |
| parent | 0caed41fd101fda7606680408363c6612c51599d (diff) | |
etnaviv: move initialisation of final operation of composite
Move the initialisation of the final composite operation into the
main function, rather than being duplicated in three different
locations.
Signed-off-by: Russell King <rmk@armlinux.org.uk>
| -rw-r--r-- | etnaviv/etnaviv_render.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etnaviv/etnaviv_render.c b/etnaviv/etnaviv_render.c index ecd6b89..3b5420d 100644 --- a/etnaviv/etnaviv_render.c +++ b/etnaviv/etnaviv_render.c @@ -520,7 +520,6 @@ static Bool etnaviv_Composite_Clear(PicturePtr pDst, struct etnaviv_composite_st return FALSE; state->final_op.src = INIT_BLIT_PIX(vDst, vDst->pict_format, ZERO_OFFSET); - state->final_op.dst = INIT_BLIT_PIX(vDst, vDst->pict_format, state->dst.offset); return TRUE; } @@ -590,7 +589,6 @@ static int etnaviv_accel_composite_srconly(PicturePtr pSrc, PicturePtr pDst, return FALSE; state->final_op.src = INIT_BLIT_PIX(vSrc, vSrc->pict_format, src_topleft); - state->final_op.dst = INIT_BLIT_PIX(state->dst.pix, state->dst.pix->pict_format, state->dst.offset); return TRUE; } @@ -725,7 +723,6 @@ finish: return FALSE; state->final_op.src = INIT_BLIT_PIX(vSrc, vSrc->pict_format, src_topleft); - state->final_op.dst = INIT_BLIT_PIX(state->dst.pix, state->dst.pix->pict_format, state->dst.offset); return TRUE; @@ -948,6 +945,9 @@ static int etnaviv_accel_Composite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, * this step. */ if (rc) { + state.final_op.dst = INIT_BLIT_PIX(state.dst.pix, + state.dst.pix->pict_format, + state.dst.offset); state.final_op.clip = RegionExtents(&state.region); state.final_op.blend_op = &state.final_blend; state.final_op.src_origin_mode = SRC_ORIGIN_RELATIVE; |