aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/miext/damage
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/miext/damage')
-rw-r--r--xorg-server/miext/damage/damage.c7
-rw-r--r--xorg-server/miext/damage/damagestr.h4
2 files changed, 0 insertions, 11 deletions
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;