svn merge ^/branches/released

1 files changed, 38 insertions, 35 deletions

diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c
index d7958066b..dfa415893 100644
--- a/xorg-server/exa/exa_unaccel.c
+++ b/xorg-server/exa/exa_unaccel.c
@@ -74,26 +74,26 @@ void
 ExaCheckFillSpans (DrawablePtr pDrawable, GCPtr pGC, int nspans,

 		   DDXPointPtr ppt, int *pwidth, int fSorted)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));

     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);

     exaPrepareAccessGC (pGC);

     pGC->ops->FillSpans (pDrawable, pGC, nspans, ppt, pwidth, fSorted);

     exaFinishAccessGC (pGC);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

 ExaCheckSetSpans (DrawablePtr pDrawable, GCPtr pGC, char *psrc,

 		 DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));

     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);

     pGC->ops->SetSpans (pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

@@ -103,9 +103,8 @@ ExaCheckPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth,
 {

     PixmapPtr pPixmap = exaGetDrawablePixmap(pDrawable);

     ExaPixmapPriv(pPixmap);

-    ExaScreenPriv(pDrawable->pScreen);

 

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));

     if (!pExaScr->prepare_access_reg || !pExaPixmap->pDamage ||

 	exaGCReadsDestination(pDrawable, pGC->planemask, pGC->fillStyle,

@@ -116,7 +115,7 @@ ExaCheckPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth,
 				    DamagePendingRegion(pExaPixmap->pDamage));

     pGC->ops->PutImage (pDrawable, pGC, depth, x, y, w, h, leftPad, format, bits);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

@@ -124,7 +123,7 @@ ExaCheckCopyNtoN (DrawablePtr pSrc, DrawablePtr pDst,  GCPtr pGC,
 	     BoxPtr	pbox, int nbox, int dx, int dy, Bool	reverse, 

 	     Bool upsidedown, Pixel bitplane, void *closure)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,

 		  exaDrawableLocation(pSrc), exaDrawableLocation(pDst)));

     exaPrepareAccess (pDst, EXA_PREPARE_DEST);

@@ -137,7 +136,7 @@ ExaCheckCopyNtoN (DrawablePtr pSrc, DrawablePtr pDst,  GCPtr pGC,
     }

     exaFinishAccess (pSrc, EXA_PREPARE_SRC);

     exaFinishAccess (pDst, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 RegionPtr

@@ -146,7 +145,7 @@ ExaCheckCopyArea (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
 {

     RegionPtr ret;

 

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,

 		  exaDrawableLocation(pSrc), exaDrawableLocation(pDst)));

     exaPrepareAccess (pDst, EXA_PREPARE_DEST);

@@ -154,7 +153,7 @@ ExaCheckCopyArea (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
     ret = pGC->ops->CopyArea (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty);

     exaFinishAccess (pSrc, EXA_PREPARE_SRC);

     exaFinishAccess (pDst, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 

     return ret;

 }

@@ -166,7 +165,7 @@ ExaCheckCopyPlane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
 {

     RegionPtr ret;

 

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,

 		  exaDrawableLocation(pSrc), exaDrawableLocation(pDst)));

     exaPrepareAccess (pDst, EXA_PREPARE_DEST);

@@ -175,7 +174,7 @@ ExaCheckCopyPlane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
 		       bitPlane);

     exaFinishAccess (pSrc, EXA_PREPARE_SRC);

     exaFinishAccess (pDst, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 

     return ret;

 }

@@ -184,19 +183,19 @@ void
 ExaCheckPolyPoint (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,

 		  DDXPointPtr pptInit)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));

     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);

     pGC->ops->PolyPoint (pDrawable, pGC, mode, npt, pptInit);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

 ExaCheckPolylines (DrawablePtr pDrawable, GCPtr pGC,

 		  int mode, int npt, DDXPointPtr ppt)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c), width %d, mode %d, count %d\n",

 		  pDrawable, exaDrawableLocation(pDrawable),

 		  pGC->lineWidth, mode, npt));

@@ -206,14 +205,14 @@ ExaCheckPolylines (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->Polylines (pDrawable, pGC, mode, npt, ppt);

     exaFinishAccessGC (pGC);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

 ExaCheckPolySegment (DrawablePtr pDrawable, GCPtr pGC,

 		    int nsegInit, xSegment *pSegInit)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c) width %d, count %d\n", pDrawable,

 		  exaDrawableLocation(pDrawable), pGC->lineWidth, nsegInit));

 

@@ -222,14 +221,14 @@ ExaCheckPolySegment (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->PolySegment (pDrawable, pGC, nsegInit, pSegInit);

     exaFinishAccessGC (pGC);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

 ExaCheckPolyArc (DrawablePtr pDrawable, GCPtr pGC,

 		int narcs, xArc *pArcs)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));

 

     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);

@@ -237,14 +236,14 @@ ExaCheckPolyArc (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->PolyArc (pDrawable, pGC, narcs, pArcs);

     exaFinishAccessGC (pGC);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

 ExaCheckPolyFillRect (DrawablePtr pDrawable, GCPtr pGC,

 		     int nrect, xRectangle *prect)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));

 

     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);

@@ -252,7 +251,7 @@ ExaCheckPolyFillRect (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->PolyFillRect (pDrawable, pGC, nrect, prect);

     exaFinishAccessGC (pGC);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

@@ -260,7 +259,7 @@ ExaCheckImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC,
 		      int x, int y, unsigned int nglyph,

 		      CharInfoPtr *ppci, pointer pglyphBase)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c)\n", pDrawable,

 		  exaDrawableLocation(pDrawable)));

     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);

@@ -268,7 +267,7 @@ ExaCheckImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->ImageGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);

     exaFinishAccessGC (pGC);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

@@ -276,7 +275,7 @@ ExaCheckPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC,
 		     int x, int y, unsigned int nglyph,

 		     CharInfoPtr *ppci, pointer pglyphBase)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,

 		  exaDrawableLocation(pDrawable), pGC->fillStyle, pGC->alu));

     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);

@@ -284,7 +283,7 @@ ExaCheckPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC,
     pGC->ops->PolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);

     exaFinishAccessGC (pGC);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

@@ -292,7 +291,7 @@ ExaCheckPushPixels (GCPtr pGC, PixmapPtr pBitmap,
 		   DrawablePtr pDrawable,

 		   int w, int h, int x, int y)

 {

-    EXA_GC_PROLOGUE(pGC);

+    EXA_PRE_FALLBACK_GC(pGC);

     EXA_FALLBACK(("from %p to %p (%c,%c)\n", pBitmap, pDrawable,

 		  exaDrawableLocation(&pBitmap->drawable),

 		  exaDrawableLocation(pDrawable)));

@@ -303,7 +302,7 @@ ExaCheckPushPixels (GCPtr pGC, PixmapPtr pBitmap,
     exaFinishAccessGC (pGC);

     exaFinishAccess (&pBitmap->drawable, EXA_PREPARE_SRC);

     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);

-    EXA_GC_EPILOGUE(pGC);

+    EXA_POST_FALLBACK_GC(pGC);

 }

 

 void

@@ -311,7 +310,7 @@ ExaCheckCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {

     DrawablePtr pDrawable = &pWin->drawable;

     ScreenPtr pScreen = pDrawable->pScreen;

-    ExaScreenPriv(pScreen);

+    EXA_PRE_FALLBACK(pScreen);

     EXA_FALLBACK(("from %p\n", pWin));

 

     /* being both src and dest, src is safest. */

@@ -320,6 +319,7 @@ ExaCheckCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     pScreen->CopyWindow (pWin, ptOldOrg, prgnSrc);

     swap(pExaScr, pScreen, CopyWindow);

     exaFinishAccess (pDrawable, EXA_PREPARE_SRC);

+    EXA_POST_FALLBACK(pScreen);

 }

 

 void

@@ -328,8 +328,7 @@ ExaCheckGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
 {

     ScreenPtr pScreen = pDrawable->pScreen;

     PixmapPtr pPix = exaGetDrawablePixmap (pDrawable);

-    ExaScreenPriv(pScreen);

-

+    EXA_PRE_FALLBACK(pScreen);

     EXA_FALLBACK(("from %p (%c)\n", pDrawable,

 		  exaDrawableLocation(pDrawable)));

 

@@ -355,6 +354,7 @@ ExaCheckGetImage(DrawablePtr pDrawable, int x, int y, int w, int h,
     pScreen->GetImage (pDrawable, x, y, w, h, format, planeMask, d);

     swap(pExaScr, pScreen, GetImage);

     exaFinishAccess (pDrawable, EXA_PREPARE_SRC);

+    EXA_POST_FALLBACK(pScreen);

 }

 

 void

@@ -366,14 +366,15 @@ ExaCheckGetSpans (DrawablePtr pDrawable,
 		 char *pdstStart)

 {

     ScreenPtr pScreen = pDrawable->pScreen;

-    ExaScreenPriv(pScreen);

 

+    EXA_PRE_FALLBACK(pScreen);

     EXA_FALLBACK(("from %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));

     exaPrepareAccess (pDrawable, EXA_PREPARE_SRC);

     swap(pExaScr, pScreen, GetSpans);

     pScreen->GetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);

     swap(pExaScr, pScreen, GetSpans);

     exaFinishAccess (pDrawable, EXA_PREPARE_SRC);

+    EXA_POST_FALLBACK(pScreen);

 }

 

 void

@@ -394,9 +395,9 @@ ExaCheckComposite (CARD8      op,
 #ifdef RENDER

     PictureScreenPtr	ps = GetPictureScreen(pScreen);

 #endif /* RENDER */

-    ExaScreenPriv(pScreen);

     RegionRec region;

     int xoff, yoff;

+    EXA_PRE_FALLBACK(pScreen);

 

     REGION_NULL(pScreen, &region);

 

@@ -471,6 +472,7 @@ skip:
 	exaFinishAccess(pMask->alphaMap->pDrawable, EXA_PREPARE_AUX_MASK);

 

     REGION_UNINIT(pScreen, &region);

+    EXA_POST_FALLBACK(pScreen);

 }

 

 void

@@ -484,7 +486,7 @@ ExaCheckAddTraps (PicturePtr	pPicture,
 #ifdef RENDER

     PictureScreenPtr	ps = GetPictureScreen(pScreen);

 #endif /* RENDER */

-    ExaScreenPriv(pScreen);

+    EXA_PRE_FALLBACK(pScreen);

 

     EXA_FALLBACK(("to pict %p (%c)\n",

 		  exaDrawableLocation(pPicture->pDrawable)));

@@ -495,6 +497,7 @@ ExaCheckAddTraps (PicturePtr	pPicture,
     swap(pExaScr, ps, AddTraps);

 #endif /* RENDER */

     exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);

+    EXA_POST_FALLBACK(pScreen);

 }

 

 /**