9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
76 lines
2.5 KiB
C
76 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;\
|
|
}}
|