diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-05 21:25:49 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 02:42:18 +0100 |
| commit | 6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 (patch) | |
| tree | 4786ef47d0905699657939e469414ab1438ff2e8 /nx-X11/programs/Xserver/mi/misprite.c | |
| parent | 23dd2959ba5e87d078436b2389d084b76581d12f (diff) | |
| download | nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.gz nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.bz2 nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.zip | |
Lift mi to xorg-xserver-7.1/1.1.0 state
I left out glx changes to miinitext.c for now.
Diffstat (limited to 'nx-X11/programs/Xserver/mi/misprite.c')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/misprite.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c index 151de776d..67ac717ed 100644 --- a/nx-X11/programs/Xserver/mi/misprite.c +++ b/nx-X11/programs/Xserver/mi/misprite.c @@ -98,8 +98,8 @@ static void miSpriteComputeSaved(ScreenPtr pScreen); ((pScreen)->field = \ ((miSpriteScreenPtr) (pScreen)->devPrivates[miSpriteScreenIndex].ptr)->field) -#define SCREEN_EPILOGUE(pScreen, field, wrapper)\ - ((pScreen)->field = wrapper) +#define SCREEN_EPILOGUE(pScreen, field)\ + ((pScreen)->field = miSprite##field) /* * void *-sprite method table @@ -298,7 +298,7 @@ miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine) (*pScreen->GetImage) (pDrawable, sx, sy, w, h, format, planemask, pdstLine); - SCREEN_EPILOGUE (pScreen, GetImage, miSpriteGetImage); + SCREEN_EPILOGUE (pScreen, GetImage); } static void @@ -344,7 +344,7 @@ miSpriteGetSpans (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 @@ -370,7 +370,7 @@ miSpriteSourceValidate (pDrawable, x, y, width, height) if (pScreen->SourceValidate) (*pScreen->SourceValidate) (pDrawable, x, y, width, height); - SCREEN_EPILOGUE (pScreen, SourceValidate, miSpriteSourceValidate); + SCREEN_EPILOGUE (pScreen, SourceValidate); } static void @@ -393,7 +393,7 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc) } (*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc); - SCREEN_EPILOGUE (pScreen, CopyWindow, miSpriteCopyWindow); + SCREEN_EPILOGUE (pScreen, CopyWindow); } static void @@ -412,7 +412,7 @@ miSpriteBlockHandler (i, blockData, pTimeout, pReadmask) (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); - SCREEN_EPILOGUE(pScreen, BlockHandler, miSpriteBlockHandler); + SCREEN_EPILOGUE(pScreen, BlockHandler); if (!pPriv->isUp && pPriv->shouldBeUp) { @@ -434,7 +434,7 @@ miSpriteInstallColormap (pMap) (*pScreen->InstallColormap) (pMap); - SCREEN_EPILOGUE(pScreen, InstallColormap, miSpriteInstallColormap); + SCREEN_EPILOGUE(pScreen, InstallColormap); pPriv->pInstalledMap = pMap; if (pPriv->pColormap != pMap) @@ -463,7 +463,7 @@ miSpriteStoreColors (pMap, ndef, pdef) (*pScreen->StoreColors) (pMap, ndef, pdef); - SCREEN_EPILOGUE(pScreen, StoreColors, miSpriteStoreColors); + SCREEN_EPILOGUE(pScreen, StoreColors); if (pPriv->pColormap == pMap) { @@ -592,7 +592,7 @@ miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy) (*pScreen->SaveDoomedAreas) (pWin, pObscured, dx, dy); - SCREEN_EPILOGUE (pScreen, SaveDoomedAreas, miSpriteSaveDoomedAreas); + SCREEN_EPILOGUE (pScreen, SaveDoomedAreas); } /* |