diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 08:57:22 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 08:57:22 +0000 |
| commit | d2bf55b405ea8f980984aab4be7d4b878c9e6981 (patch) | |
| tree | 676ad441e287f6de1950260c3d2ef0b720f69bad /xorg-server/miext/cw | |
| parent | a46e26df6103fb0e6e00d8d11d58c3f7a358208c (diff) | |
| download | vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.gz vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.bz2 vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.zip | |
git update 22/4/2010
Diffstat (limited to 'xorg-server/miext/cw')
| -rw-r--r-- | xorg-server/miext/cw/cw.c | 10 | ||||
| -rw-r--r-- | xorg-server/miext/cw/cw.h | 2 | ||||
| -rw-r--r-- | xorg-server/miext/cw/cw_render.c | 3 |
3 files changed, 0 insertions, 15 deletions
diff --git a/xorg-server/miext/cw/cw.c b/xorg-server/miext/cw/cw.c index 74000ffa0..247cb83e1 100644 --- a/xorg-server/miext/cw/cw.c +++ b/xorg-server/miext/cw/cw.c @@ -49,10 +49,8 @@ static int cwScreenKeyIndex; DevPrivateKey cwScreenKey = &cwScreenKeyIndex; static int cwWindowKeyIndex; DevPrivateKey cwWindowKey = &cwWindowKeyIndex; -#ifdef RENDER static int cwPictureKeyIndex; DevPrivateKey cwPictureKey = &cwPictureKeyIndex; -#endif extern GCOps cwGCOps; static Bool @@ -477,9 +475,7 @@ void miInitializeCompositeWrapper(ScreenPtr pScreen) { cwScreenPtr pScreenPriv; -#ifdef RENDER Bool has_render = GetPictureScreenIfSet(pScreen) != NULL; -#endif if (!dixRequestPrivate(cwGCKey, sizeof(cwGCRec))) return; @@ -499,19 +495,15 @@ miInitializeCompositeWrapper(ScreenPtr pScreen) SCREEN_EPILOGUE(pScreen, SetWindowPixmap, cwSetWindowPixmap); SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap); -#ifdef RENDER if (has_render) cwInitializeRender(pScreen); -#endif } static Bool cwCloseScreen (int i, ScreenPtr pScreen) { cwScreenPtr pScreenPriv; -#ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -#endif pScreenPriv = (cwScreenPtr)dixLookupPrivate(&pScreen->devPrivates, cwScreenKey); @@ -521,10 +513,8 @@ cwCloseScreen (int i, ScreenPtr pScreen) pScreen->CreateGC = pScreenPriv->CreateGC; pScreen->CopyWindow = pScreenPriv->CopyWindow; -#ifdef RENDER if (ps) cwFiniRender(pScreen); -#endif xfree((pointer)pScreenPriv); diff --git a/xorg-server/miext/cw/cw.h b/xorg-server/miext/cw/cw.h index ae65503f5..79051dfa2 100644 --- a/xorg-server/miext/cw/cw.h +++ b/xorg-server/miext/cw/cw.h @@ -90,7 +90,6 @@ typedef struct { GetWindowPixmapProcPtr GetWindowPixmap; SetWindowPixmapProcPtr SetWindowPixmap; -#ifdef RENDER DestroyPictureProcPtr DestroyPicture; ChangePictureClipProcPtr ChangePictureClip; DestroyPictureClipProcPtr DestroyPictureClip; @@ -107,7 +106,6 @@ typedef struct { TriFanProcPtr TriFan; RasterizeTrapezoidProcPtr RasterizeTrapezoid; -#endif } cwScreenRec, *cwScreenPtr; extern _X_EXPORT DevPrivateKey cwScreenKey; diff --git a/xorg-server/miext/cw/cw_render.c b/xorg-server/miext/cw/cw_render.c index 6e0c727c2..dfe2681e0 100644 --- a/xorg-server/miext/cw/cw_render.c +++ b/xorg-server/miext/cw/cw_render.c @@ -30,8 +30,6 @@ #include "windowstr.h" #include "cw.h" -#ifdef RENDER - #define cwPsDecl(pScreen) \ PictureScreenPtr ps = GetPictureScreen (pScreen); \ cwScreenPtr pCwScreen = getCwScreen (pScreen) @@ -469,4 +467,3 @@ cwFiniRender (ScreenPtr pScreen) cwPsUnwrap(TriFan); } -#endif /* RENDER */ |