2dc138922b
This is a combination of a huge mechanical patch and a few small fixups required to finish the job. They were reviewed separately, but because the server does not build without both pieces, I've merged them together at this time. The mechanical changes were performed by running the included 'fix-region' script over the whole tree: $ git ls-files | grep -v '^fix-' | xargs ./fix-region And then, the white space errors in the resulting patch were fixed using the provided fix-patch-whitespace script. $ sh ./fix-patch-whitespace Thanks to Jamey Sharp for the mighty fine sed-generating sed script. The hand-done changes involve removing functions from dix/region.c that duplicate inline functions in include/regionstr.h, along with their declarations in regionstr.h, mi.h and mispans.h. Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
80 lines
2.5 KiB
C
80 lines
2.5 KiB
C
|
|
#define XAA_SCREEN_PROLOGUE(pScreen, field)\
|
|
((pScreen)->field = \
|
|
((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
|
|
|
|
#define XAA_SCREEN_EPILOGUE(pScreen, field, wrapper)\
|
|
((pScreen)->field = wrapper)
|
|
|
|
|
|
#define XAA_GC_FUNC_PROLOGUE(pGC)\
|
|
XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
|
|
(pGC)->funcs = pGCPriv->wrapFuncs;\
|
|
if(pGCPriv->flags)\
|
|
(pGC)->ops = pGCPriv->wrapOps
|
|
|
|
#define XAA_GC_FUNC_EPILOGUE(pGC)\
|
|
pGCPriv->wrapFuncs = (pGC)->funcs;\
|
|
(pGC)->funcs = &XAAGCFuncs;\
|
|
if(pGCPriv->flags) {\
|
|
pGCPriv->wrapOps = (pGC)->ops;\
|
|
(pGC)->ops = (pGCPriv->flags & OPS_ARE_ACCEL) ? pGCPriv->XAAOps :\
|
|
&XAAPixmapOps;\
|
|
}
|
|
|
|
|
|
#define XAA_GC_OP_PROLOGUE(pGC)\
|
|
XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
|
|
GCFuncs *oldFuncs = pGC->funcs;\
|
|
pGC->funcs = pGCPriv->wrapFuncs;\
|
|
pGC->ops = pGCPriv->wrapOps
|
|
|
|
#define XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC)\
|
|
XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
|
|
GCFuncs *oldFuncs = pGC->funcs;\
|
|
if(!RegionNumRects(pGC->pCompositeClip)) return; \
|
|
pGC->funcs = pGCPriv->wrapFuncs;\
|
|
pGC->ops = pGCPriv->wrapOps
|
|
|
|
|
|
#define XAA_GC_OP_EPILOGUE(pGC)\
|
|
pGCPriv->wrapOps = pGC->ops;\
|
|
pGC->funcs = oldFuncs;\
|
|
pGC->ops = pGCPriv->XAAOps
|
|
|
|
|
|
#define XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw)\
|
|
XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
|
|
XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDraw));\
|
|
GCFuncs *oldFuncs = pGC->funcs;\
|
|
pGC->funcs = pGCPriv->wrapFuncs;\
|
|
pGC->ops = pGCPriv->wrapOps; \
|
|
SYNC_CHECK(pGC)
|
|
|
|
#define XAA_PIXMAP_OP_EPILOGUE(pGC)\
|
|
pGCPriv->wrapOps = pGC->ops;\
|
|
pGC->funcs = oldFuncs;\
|
|
pGC->ops = &XAAPixmapOps;\
|
|
pixPriv->flags |= DIRTY
|
|
|
|
#ifdef HAVE_XORG_CONFIG_H
|
|
#include <xorg-config.h>
|
|
#endif
|
|
|
|
#define XAA_RENDER_PROLOGUE(pScreen,field)\
|
|
(GetPictureScreen(pScreen)->field = \
|
|
((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
|
|
|
|
#define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\
|
|
(GetPictureScreen(pScreen)->field = wrapper)
|
|
|
|
/* This also works fine for drawables */
|
|
|
|
#define SYNC_CHECK(pGC) {\
|
|
XAAInfoRecPtr infoRec =\
|
|
((XAAScreenPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAGetScreenKey()))->AccelInfoRec; \
|
|
if(infoRec->NeedToSync) {\
|
|
(*infoRec->Sync)(infoRec->pScrn);\
|
|
infoRec->NeedToSync = FALSE;\
|
|
}}
|