[PATCH 2/4] XAA: Unconditionally SYNC_CHECK in XAACopy{Area, Plane}Fallback.

Jamey Sharp jamey at minilop.net
Sat Oct 1 23:36:55 PDT 2011


These are the only fallbacks that were ever choosing not to sync. This
patch makes them consistent with not only the other fallbacks, but also
with the pixmap fallbacks as of Luc Verhaegen's commit in 2008,
59f9fb4b8c031df69b3592a26b77e744ff4a556e.

Signed-off-by: Jamey Sharp <jamey at minilop.net>
---
 hw/xfree86/xaa/xaaFallback.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c
index deeadbf..4a1b1dd 100644
--- a/hw/xfree86/xaa/xaaFallback.c
+++ b/hw/xfree86/xaa/xaaFallback.c
@@ -78,10 +78,7 @@ XAACopyAreaFallback(
     RegionPtr ret;
 
     XAA_GC_OP_PROLOGUE(pGC);
-    if((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||
-	IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {
-	SYNC_CHECK(pGC);
-    }
+    SYNC_CHECK(pGC);
     ret = (*pGC->ops->CopyArea)(pSrc, pDst,
             pGC, srcx, srcy, width, height, dstx, dsty);
     XAA_GC_OP_EPILOGUE(pGC);
@@ -101,10 +98,7 @@ XAACopyPlaneFallback(
     RegionPtr ret;
 
     XAA_GC_OP_PROLOGUE(pGC);
-    if((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||
-	IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {
-	SYNC_CHECK(pGC);
-    }
+    SYNC_CHECK(pGC);
     ret = (*pGC->ops->CopyPlane)(pSrc, pDst,
 	       pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);
     XAA_GC_OP_EPILOGUE(pGC);
-- 
1.7.5.4



More information about the xorg-devel mailing list