git update 22/4/2010

8 files changed, 0 insertions, 38 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 */
diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c
index 2851aed8d..de1857355 100644
--- a/xorg-server/miext/damage/damage.c
+++ b/xorg-server/miext/damage/damage.c
@@ -596,8 +596,6 @@ damageDestroyClip(GCPtr pGC)
 				  REGION_NOTEMPTY(d->pScreen, \
 						  g->pCompositeClip)))
 
-#ifdef RENDER
-
 #define TRIM_PICTURE_BOX(box, pDst) { \
     BoxPtr extents = &pDst->pCompositeClip->extents;\
     if(box.x1 < extents->x1) box.x1 = extents->x1; \
@@ -774,7 +772,6 @@ damageAddTraps (PicturePtr  pPicture,
     damageRegionProcessPending (pPicture->pDrawable);
     wrap (pScrPriv, ps, AddTraps, damageAddTraps);
 }
-#endif
 
 /**********************************************************/
 
@@ -1882,9 +1879,7 @@ Bool
 DamageSetup (ScreenPtr pScreen)
 {
     DamageScrPrivPtr	pScrPriv;
-#ifdef RENDER
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
-#endif
     const DamageScreenFuncsRec miFuncs = {
 	miDamageCreate, miDamageRegister, miDamageUnregister, miDamageDestroy
     };
@@ -1908,13 +1903,11 @@ DamageSetup (ScreenPtr pScreen)
     wrap (pScrPriv, pScreen, SetWindowPixmap, damageSetWindowPixmap);
     wrap (pScrPriv, pScreen, CopyWindow, damageCopyWindow);
     wrap (pScrPriv, pScreen, CloseScreen, damageCloseScreen);
-#ifdef RENDER
     if (ps) {
 	wrap (pScrPriv, ps, Glyphs, damageGlyphs);
 	wrap (pScrPriv, ps, Composite, damageComposite);
 	wrap (pScrPriv, ps, AddTraps, damageAddTraps);
     }
-#endif
 
     pScrPriv->funcs = miFuncs;
 
diff --git a/xorg-server/miext/damage/damagestr.h b/xorg-server/miext/damage/damagestr.h
index d7435b2a1..b224958d1 100644
--- a/xorg-server/miext/damage/damagestr.h
+++ b/xorg-server/miext/damage/damagestr.h
@@ -30,9 +30,7 @@
 #include "damage.h"
 #include "gcstruct.h"
 #include "privates.h"
-#ifdef RENDER
 # include "picturestr.h"
-#endif
 
 typedef struct _damage {
     DamagePtr		pNext;
@@ -72,11 +70,9 @@ typedef struct _damageScrPriv {
     DestroyPixmapProcPtr	DestroyPixmap;
     SetWindowPixmapProcPtr	SetWindowPixmap;
     DestroyWindowProcPtr	DestroyWindow;
-#ifdef RENDER
     CompositeProcPtr		Composite;
     GlyphsProcPtr		Glyphs;
     AddTrapsProcPtr		AddTraps;
-#endif
 
     /* Table of wrappable function pointers */
     DamageScreenFuncsRec	funcs;
diff --git a/xorg-server/miext/rootless/rootlessCommon.h b/xorg-server/miext/rootless/rootlessCommon.h
index d4a94f8ca..f44c4e8cf 100644
--- a/xorg-server/miext/rootless/rootlessCommon.h
+++ b/xorg-server/miext/rootless/rootlessCommon.h
@@ -42,9 +42,7 @@
 
 #include "scrnintstr.h"
 
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 
 // Debug output, or not.
@@ -100,10 +98,8 @@ typedef struct _RootlessScreenRec {
 
     SetShapeProcPtr SetShape;
 
-#ifdef RENDER
     CompositeProcPtr Composite;
     GlyphsProcPtr Glyphs;
-#endif
 
     InstallColormapProcPtr InstallColormap;
     UninstallColormapProcPtr UninstallColormap;
diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c
index 7a799d98c..5f249467b 100644
--- a/xorg-server/miext/rootless/rootlessScreen.c
+++ b/xorg-server/miext/rootless/rootlessScreen.c
@@ -242,8 +242,6 @@ RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h)
     SCREEN_WRAP(pDrawable->pScreen, SourceValidate);
 }
 
-#ifdef RENDER
-
 static void
 RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
                   INT16 xSrc, INT16 ySrc, INT16  xMask, INT16  yMask,
@@ -363,8 +361,6 @@ RootlessGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
     }
 }
 
-#endif // RENDER
-
 
 /*
  * RootlessValidateTree
@@ -698,7 +694,6 @@ RootlessWrap(ScreenPtr pScreen)
 
     WRAP(SetShape);
 
-#ifdef RENDER
     {
         // Composite and Glyphs don't use normal screen wrapping
         PictureScreenPtr ps = GetPictureScreen(pScreen);
@@ -707,7 +702,6 @@ RootlessWrap(ScreenPtr pScreen)
         s->Glyphs = ps->Glyphs;
         ps->Glyphs = RootlessGlyphs;
     }
-#endif
 
     // WRAP(ClearToBackground); fixme put this back? useful for shaped wins?
 
diff --git a/xorg-server/miext/shadow/shadow.h b/xorg-server/miext/shadow/shadow.h
index ef85c0bb9..f4473052d 100644
--- a/xorg-server/miext/shadow/shadow.h
+++ b/xorg-server/miext/shadow/shadow.h
@@ -26,9 +26,7 @@
 
 #include "scrnintstr.h"
 
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 #include "damage.h"
 #include "damagestr.h"