diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-07-05 06:28:37 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2011-12-14 18:30:27 -0800 |
| commit | 6983197c8f1a3cc0ba64133af71f4acfe2a82baf (patch) | |
| tree | cb0577e0401226c8edf508f6804680d4cdbd2282 | |
| parent | 5a70cf630b8777a665363c7efc8861137109d6fc (diff) | |
XAA: Delete redundant open-coded SYNC_CHECK in XAACopy{Area,Plane}Pixmap.
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 <jamey@minilop.net>
| -rw-r--r-- | 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 30a1e0071..a1a5c8831 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -353,11 +353,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; - } + } } { @@ -379,19 +375,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); |