Since commit 59f9fb4b8c031df69b3592a26b77e744ff4a556e, when Luc Verhaegen added an unconditional SYNC_CHECK in XAA_PIXMAP_OP_PROLOGUE, these open-coded versions of SYNC_CHECK have been redundant.
In CopyPlane, NeedToSync was guaranteed to be FALSE, because if it wasn't so on entry, XAA_PIXMAP_OP_PROLOGUE would already have cleared it. In CopyArea, in any cases where the open-coded sync check actually ran, it was immediately followed by an unconditional SYNC_CHECK in the expansion of XAA_PIXMAP_OP_PROLOGUE, which would then be a no-op. Signed-off-by: Jamey Sharp <[email protected]> --- hw/xfree86/xaa/xaaGC.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index 34e0119..51245e1 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -352,11 +352,7 @@ XAACopyAreaPixmap( return (XAABitBlt( pSrc, pDst, pGC, srcx, srcy, width, height, dstx, dsty, XAADoImageRead, 0L)); - } else - if(infoRec->NeedToSync) { - (*infoRec->Sync)(infoRec->pScrn); - infoRec->NeedToSync = FALSE; - } + } } { @@ -378,19 +374,9 @@ XAACopyPlanePixmap( int dstx, int dsty, unsigned long bitPlane ){ - XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); RegionPtr ret; XAA_PIXMAP_OP_PROLOGUE(pGC, pDst); - - if(infoRec->pScrn->vtSema && - ((pSrc->type == DRAWABLE_WINDOW) || IS_OFFSCREEN_PIXMAP(pSrc))){ - if(infoRec->NeedToSync) { - (*infoRec->Sync)(infoRec->pScrn); - infoRec->NeedToSync = FALSE; - } - } - ret = (*pGC->ops->CopyPlane)(pSrc, pDst, pGC, srcx, srcy, width, height, dstx, dsty, bitPlane); XAA_PIXMAP_OP_EPILOGUE(pGC); -- 1.7.5.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
