frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style fix, make SCREEN_EPILOGUE two arguments instead of three.

This commit is contained in:
Adam Jackson 2005-12-29 20:54:08 +00:00
parent b1efb3810c
commit 6d7ee4167d
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* configure.ac: * configure.ac:
Disable building LBX by default. Disable building LBX by default.
* mi/misprite.c:
Style fix, make SCREEN_EPILOGUE two arguments instead of three.
2005-12-29 Dave Airlie <airlied@linux.ie> 2005-12-29 Dave Airlie <airlied@linux.ie>
* hw/xfree86/os-support/bus/Pci.c: (pciByteSwap): * hw/xfree86/os-support/bus/Pci.c: (pciByteSwap):

20
mi/misprite.c
View File

@ -100,8 +100,8 @@ static void miSpriteComputeSaved(ScreenPtr pScreen);
((pScreen)->field = \ ((pScreen)->field = \
((miSpriteScreenPtr) (pScreen)->devPrivates[miSpriteScreenIndex].ptr)->field) ((miSpriteScreenPtr) (pScreen)->devPrivates[miSpriteScreenIndex].ptr)->field)
#define SCREEN_EPILOGUE(pScreen, field, wrapper)\ #define SCREEN_EPILOGUE(pScreen, field)\
((pScreen)->field = wrapper) ((pScreen)->field = miSprite##field)
/* /*
* pointer-sprite method table * pointer-sprite method table
@ -301,7 +301,7 @@ miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine)
(*pScreen->GetImage) (pDrawable, sx, sy, w, h, (*pScreen->GetImage) (pDrawable, sx, sy, w, h,
format, planemask, pdstLine); format, planemask, pdstLine);
SCREEN_EPILOGUE (pScreen, GetImage, miSpriteGetImage); SCREEN_EPILOGUE (pScreen, GetImage);
} }
static void static void
@ -347,7 +347,7 @@ miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart)
(*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart); (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
SCREEN_EPILOGUE (pScreen, GetSpans, miSpriteGetSpans); SCREEN_EPILOGUE (pScreen, GetSpans);
} }
static void static void
@ -373,7 +373,7 @@ miSpriteSourceValidate (pDrawable, x, y, width, height)
if (pScreen->SourceValidate) if (pScreen->SourceValidate)
(*pScreen->SourceValidate) (pDrawable, x, y, width, height); (*pScreen->SourceValidate) (pDrawable, x, y, width, height);
SCREEN_EPILOGUE (pScreen, SourceValidate, miSpriteSourceValidate); SCREEN_EPILOGUE (pScreen, SourceValidate);
} }
static void static void
@ -396,7 +396,7 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
} }
(*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc); (*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc);
SCREEN_EPILOGUE (pScreen, CopyWindow, miSpriteCopyWindow); SCREEN_EPILOGUE (pScreen, CopyWindow);
} }
static void static void
@ -415,7 +415,7 @@ miSpriteBlockHandler (i, blockData, pTimeout, pReadmask)
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
SCREEN_EPILOGUE(pScreen, BlockHandler, miSpriteBlockHandler); SCREEN_EPILOGUE(pScreen, BlockHandler);
if (!pPriv->isUp && pPriv->shouldBeUp) if (!pPriv->isUp && pPriv->shouldBeUp)
{ {
@ -437,7 +437,7 @@ miSpriteInstallColormap (pMap)
(*pScreen->InstallColormap) (pMap); (*pScreen->InstallColormap) (pMap);
SCREEN_EPILOGUE(pScreen, InstallColormap, miSpriteInstallColormap); SCREEN_EPILOGUE(pScreen, InstallColormap);
pPriv->pInstalledMap = pMap; pPriv->pInstalledMap = pMap;
if (pPriv->pColormap != pMap) if (pPriv->pColormap != pMap)
@ -466,7 +466,7 @@ miSpriteStoreColors (pMap, ndef, pdef)
(*pScreen->StoreColors) (pMap, ndef, pdef); (*pScreen->StoreColors) (pMap, ndef, pdef);
SCREEN_EPILOGUE(pScreen, StoreColors, miSpriteStoreColors); SCREEN_EPILOGUE(pScreen, StoreColors);
if (pPriv->pColormap == pMap) if (pPriv->pColormap == pMap)
{ {
@ -595,7 +595,7 @@ miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy)
(*pScreen->SaveDoomedAreas) (pWin, pObscured, dx, dy); (*pScreen->SaveDoomedAreas) (pWin, pObscured, dx, dy);
SCREEN_EPILOGUE (pScreen, SaveDoomedAreas, miSpriteSaveDoomedAreas); SCREEN_EPILOGUE (pScreen, SaveDoomedAreas);
} }
/* /*