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

unifdef -B -DRENDER to always include RENDER code 

This patch was created with:

git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2010-04-19 09:26:10 -07:00
parent b3ab978df8
commit 28b7b2b8d0
55 changed files with 1 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xext/panoramiX.c
View File

@ -52,9 +52,7 @@ Equipment Corporation.
#include "globals.h" #include "globals.h"
#include "servermd.h" #include "servermd.h"
#include "resource.h" #include "resource.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
#include "modinit.h" #include "modinit.h"
#include "protocol-versions.h" #include "protocol-versions.h"
@ -589,9 +587,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
ProcVector[X_StoreColors] = PanoramiXStoreColors; ProcVector[X_StoreColors] = PanoramiXStoreColors;
ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor; ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor;
#ifdef RENDER
PanoramiXRenderInit (); PanoramiXRenderInit ();
#endif
} }
extern Bool CreateConnectionBlock(void); extern Bool CreateConnectionBlock(void);
@ -891,9 +887,7 @@ static void PanoramiXResetProc(ExtensionEntry* extEntry)
{ {
int i; int i;
#ifdef RENDER
PanoramiXRenderReset (); PanoramiXRenderReset ();
#endif
screenInfo.numScreens = PanoramiXNumScreens; screenInfo.numScreens = PanoramiXNumScreens;
for (i = 256; i--; ) for (i = 256; i--; )
ProcVector[i] = SavedProcVector[i]; ProcVector[i] = SavedProcVector[i];

2
Xext/panoramiX.h
View File

@ -69,11 +69,9 @@ typedef struct {
struct { struct {
Bool shared; Bool shared;
} pix; } pix;
#ifdef RENDER
struct { struct {
Bool root; Bool root;
} pict; } pict;
#endif
char raw_data[4]; char raw_data[4];
} u; } u;
} PanoramiXRes; } PanoramiXRes;

10
exa/exa.c
View File

@ -753,9 +753,7 @@ static Bool
exaCloseScreen(int i, ScreenPtr pScreen) exaCloseScreen(int i, ScreenPtr pScreen)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
#endif
if (ps->Glyphs == exaGlyphs) if (ps->Glyphs == exaGlyphs)
exaGlyphsFini(pScreen); exaGlyphsFini(pScreen);
@ -778,7 +776,6 @@ exaCloseScreen(int i, ScreenPtr pScreen)
unwrap(pExaScr, pScreen, ChangeWindowAttributes); unwrap(pExaScr, pScreen, ChangeWindowAttributes);
unwrap(pExaScr, pScreen, BitmapToRegion); unwrap(pExaScr, pScreen, BitmapToRegion);
unwrap(pExaScr, pScreen, CreateScreenResources); unwrap(pExaScr, pScreen, CreateScreenResources);
#ifdef RENDER
if (ps) { if (ps) {
unwrap(pExaScr, ps, Composite); unwrap(pExaScr, ps, Composite);
if (pExaScr->SavedGlyphs) if (pExaScr->SavedGlyphs)
@ -787,7 +784,6 @@ exaCloseScreen(int i, ScreenPtr pScreen)
unwrap(pExaScr, ps, Triangles); unwrap(pExaScr, ps, Triangles);
unwrap(pExaScr, ps, AddTraps); unwrap(pExaScr, ps, AddTraps);
} }
#endif
xfree (pExaScr); xfree (pExaScr);
@ -825,9 +821,7 @@ exaDriverInit (ScreenPtr pScreen,
ExaDriverPtr pScreenInfo) ExaDriverPtr pScreenInfo)
{ {
ExaScreenPrivPtr pExaScr; ExaScreenPrivPtr pExaScr;
#ifdef RENDER
PictureScreenPtr ps; PictureScreenPtr ps;
#endif
if (!pScreenInfo) if (!pScreenInfo)
return FALSE; return FALSE;
@ -895,9 +889,7 @@ exaDriverInit (ScreenPtr pScreen,
pScreenInfo->maxPitchPixels = pScreenInfo->maxX; pScreenInfo->maxPitchPixels = pScreenInfo->maxX;
} }
#ifdef RENDER
ps = GetPictureScreenIfSet(pScreen); ps = GetPictureScreenIfSet(pScreen);
#endif
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
if (!pExaScr) { if (!pExaScr) {
@ -940,7 +932,6 @@ exaDriverInit (ScreenPtr pScreen,
wrap(pExaScr, pScreen, BitmapToRegion, exaBitmapToRegion); wrap(pExaScr, pScreen, BitmapToRegion, exaBitmapToRegion);
wrap(pExaScr, pScreen, CreateScreenResources, exaCreateScreenResources); wrap(pExaScr, pScreen, CreateScreenResources, exaCreateScreenResources);
#ifdef RENDER
if (ps) { if (ps) {
wrap(pExaScr, ps, Composite, exaComposite); wrap(pExaScr, ps, Composite, exaComposite);
if (pScreenInfo->PrepareComposite) if (pScreenInfo->PrepareComposite)
@ -949,7 +940,6 @@ exaDriverInit (ScreenPtr pScreen,
wrap(pExaScr, ps, Triangles, exaTriangles); wrap(pExaScr, ps, Triangles, exaTriangles);
wrap(pExaScr, ps, AddTraps, ExaCheckAddTraps); wrap(pExaScr, ps, AddTraps, ExaCheckAddTraps);
} }
#endif
#ifdef MITSHM #ifdef MITSHM
/* /*

6
exa/exa_priv.h
View File

@ -50,10 +50,8 @@
#include "dix.h" #include "dix.h"
#include "fb.h" #include "fb.h"
#include "fboverlay.h" #include "fboverlay.h"
#ifdef RENDER
#include "fbpict.h" #include "fbpict.h"
#include "glyphstr.h" #include "glyphstr.h"
#endif
#include "damage.h" #include "damage.h"
#define DEBUG_TRACE_FALL 0 #define DEBUG_TRACE_FALL 0
@ -166,13 +164,11 @@ typedef struct {
CreateScreenResourcesProcPtr SavedCreateScreenResources; CreateScreenResourcesProcPtr SavedCreateScreenResources;
ModifyPixmapHeaderProcPtr SavedModifyPixmapHeader; ModifyPixmapHeaderProcPtr SavedModifyPixmapHeader;
SourceValidateProcPtr SavedSourceValidate; SourceValidateProcPtr SavedSourceValidate;
#ifdef RENDER
CompositeProcPtr SavedComposite; CompositeProcPtr SavedComposite;
TrianglesProcPtr SavedTriangles; TrianglesProcPtr SavedTriangles;
GlyphsProcPtr SavedGlyphs; GlyphsProcPtr SavedGlyphs;
TrapezoidsProcPtr SavedTrapezoids; TrapezoidsProcPtr SavedTrapezoids;
AddTrapsProcPtr SavedAddTraps; AddTrapsProcPtr SavedAddTraps;
#endif
void (*do_migration) (ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel); void (*do_migration) (ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel);
Bool (*pixmap_has_gpu_copy) (PixmapPtr pPixmap); Bool (*pixmap_has_gpu_copy) (PixmapPtr pPixmap);
void (*do_move_in_pixmap) (PixmapPtr pPixmap); void (*do_move_in_pixmap) (PixmapPtr pPixmap);
@ -499,7 +495,6 @@ exaCopyNtoN (DrawablePtr pSrcDrawable,
extern const GCOps exaOps; extern const GCOps exaOps;
#ifdef RENDER
void void
ExaCheckComposite (CARD8 op, ExaCheckComposite (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
@ -513,7 +508,6 @@ ExaCheckComposite (CARD8 op,
INT16 yDst, INT16 yDst,
CARD16 width, CARD16 width,
CARD16 height); CARD16 height);
#endif
/* exa_offscreen.c */ /* exa_offscreen.c */
void void

2
exa/exa_render.c
View File

@ -30,7 +30,6 @@
#include "exa_priv.h" #include "exa_priv.h"
#ifdef RENDER
#include "mipict.h" #include "mipict.h"
#if DEBUG_TRACE_FALL #if DEBUG_TRACE_FALL
@ -1072,7 +1071,6 @@ done:
if (pMask) if (pMask)
pMask->repeat = saveMaskRepeat; pMask->repeat = saveMaskRepeat;
} }
#endif
/** /**
* Same as miCreateAlphaPicture, except it uses ExaCheckPolyFillRect instead * Same as miCreateAlphaPicture, except it uses ExaCheckPolyFillRect instead

10
exa/exa_unaccel.c
View File

@ -23,9 +23,7 @@
#include "exa_priv.h" #include "exa_priv.h"
#ifdef RENDER
#include "mipict.h" #include "mipict.h"
#endif
/* /*
* These functions wrap the low-level fb rendering functions and * These functions wrap the low-level fb rendering functions and
@ -617,9 +615,7 @@ ExaCheckComposite (CARD8 op,
CARD16 height) CARD16 height)
{ {
ScreenPtr pScreen = pDst->pDrawable->pScreen; ScreenPtr pScreen = pDst->pDrawable->pScreen;
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreen(pScreen); PictureScreenPtr ps = GetPictureScreen(pScreen);
#endif /* RENDER */
EXA_PRE_FALLBACK(pScreen); EXA_PRE_FALLBACK(pScreen);
if (pExaScr->prepare_access_reg) { if (pExaScr->prepare_access_reg) {
@ -652,7 +648,6 @@ ExaCheckComposite (CARD8 op,
exaPrepareAccess (pMask->pDrawable, EXA_PREPARE_MASK); exaPrepareAccess (pMask->pDrawable, EXA_PREPARE_MASK);
} }
#ifdef RENDER
swap(pExaScr, ps, Composite); swap(pExaScr, ps, Composite);
ps->Composite (op, ps->Composite (op,
pSrc, pSrc,
@ -667,7 +662,6 @@ ExaCheckComposite (CARD8 op,
width, width,
height); height);
swap(pExaScr, ps, Composite); swap(pExaScr, ps, Composite);
#endif /* RENDER */
if (pMask && pMask->pDrawable != NULL) if (pMask && pMask->pDrawable != NULL)
exaFinishAccess (pMask->pDrawable, EXA_PREPARE_MASK); exaFinishAccess (pMask->pDrawable, EXA_PREPARE_MASK);
if (pSrc->pDrawable != NULL) if (pSrc->pDrawable != NULL)
@ -692,19 +686,15 @@ ExaCheckAddTraps (PicturePtr pPicture,
xTrap *traps) xTrap *traps)
{ {
ScreenPtr pScreen = pPicture->pDrawable->pScreen; ScreenPtr pScreen = pPicture->pDrawable->pScreen;
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreen(pScreen); PictureScreenPtr ps = GetPictureScreen(pScreen);
#endif /* RENDER */
EXA_PRE_FALLBACK(pScreen); EXA_PRE_FALLBACK(pScreen);
EXA_FALLBACK(("to pict %p (%c)\n", EXA_FALLBACK(("to pict %p (%c)\n",
exaDrawableLocation(pPicture->pDrawable))); exaDrawableLocation(pPicture->pDrawable)));
exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
#ifdef RENDER
swap(pExaScr, ps, AddTraps); swap(pExaScr, ps, AddTraps);
ps->AddTraps (pPicture, x_off, y_off, ntrap, traps); ps->AddTraps (pPicture, x_off, y_off, ntrap, traps);
swap(pExaScr, ps, AddTraps); swap(pExaScr, ps, AddTraps);
#endif /* RENDER */
exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
EXA_POST_FALLBACK(pScreen); EXA_POST_FALLBACK(pScreen);
} }

4
fb/fb.h
View File

@ -41,11 +41,7 @@
#include "mi.h" #include "mi.h"
#include "migc.h" #include "migc.h"
#include "mibstore.h" #include "mibstore.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#else
#include "picture.h"
#endif
#ifdef FB_ACCESS_WRAPPER #ifdef FB_ACCESS_WRAPPER

8
fb/fbpict.c
View File

@ -31,8 +31,6 @@
#include "fb.h" #include "fb.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#include "mipict.h" #include "mipict.h"
#include "fbpict.h" #include "fbpict.h"
@ -203,8 +201,6 @@ fbCompositeGeneral (CARD8 op,
width, height); width, height);
} }
#endif /* RENDER */
static pixman_image_t * static pixman_image_t *
create_solid_fill_image (PicturePtr pict) create_solid_fill_image (PicturePtr pict)
{ {
@ -472,8 +468,6 @@ Bool
fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
{ {
#ifdef RENDER
PictureScreenPtr ps; PictureScreenPtr ps;
if (!miPictureInit (pScreen, formats, nformats)) if (!miPictureInit (pScreen, formats, nformats))
@ -486,7 +480,5 @@ fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
ps->AddTraps = fbAddTraps; ps->AddTraps = fbAddTraps;
ps->AddTriangles = fbAddTriangles; ps->AddTriangles = fbAddTriangles;
#endif /* RENDER */
return TRUE; return TRUE;
} }

3
fb/fbtrap.c
View File

@ -26,8 +26,6 @@
#include "fb.h" #include "fb.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#include "mipict.h" #include "mipict.h"
#include "renderedge.h" #include "renderedge.h"
@ -160,4 +158,3 @@ fbAddTriangles (PicturePtr pPicture,
} }
} }
#endif /* RENDER */

4
hw/dmx/dmx.h
View File

@ -62,9 +62,7 @@
#include "globals.h" #include "globals.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
#ifdef GLXEXT #ifdef GLXEXT
#include <GL/glx.h> #include <GL/glx.h>
@ -233,7 +231,6 @@ typedef struct _DMXScreenInfo {
SetShapeProcPtr SetShape; SetShapeProcPtr SetShape;
#ifdef RENDER
CreatePictureProcPtr CreatePicture; CreatePictureProcPtr CreatePicture;
DestroyPictureProcPtr DestroyPicture; DestroyPictureProcPtr DestroyPicture;
ChangePictureClipProcPtr ChangePictureClip; ChangePictureClipProcPtr ChangePictureClip;
@ -254,7 +251,6 @@ typedef struct _DMXScreenInfo {
TrianglesProcPtr Triangles; TrianglesProcPtr Triangles;
TriStripProcPtr TriStrip; TriStripProcPtr TriStrip;
TriFanProcPtr TriFan; TriFanProcPtr TriFan;
#endif
} DMXScreenInfo; } DMXScreenInfo;
/* Global variables available to all Xserver/hw/dmx routines. */ /* Global variables available to all Xserver/hw/dmx routines. */

2
hw/dmx/dmxclient.h
View File

@ -86,10 +86,8 @@ typedef XID KeySym64;
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#ifdef RENDER
#include <X11/extensions/Xrender.h> #include <X11/extensions/Xrender.h>
#undef PictFormatType #undef PictFormatType
#endif
#include <X11/extensions/XKB.h> #include <X11/extensions/XKB.h>
#include "xkbstr.h" #include "xkbstr.h"

10
hw/dmx/dmxextension.c
View File

@ -53,9 +53,7 @@
#include "dmxgc.h" #include "dmxgc.h"
#include "dmxfont.h" #include "dmxfont.h"
#include "dmxcmap.h" #include "dmxcmap.h"
#ifdef RENDER
#include "dmxpict.h" #include "dmxpict.h"
#endif
#include "dmxinput.h" #include "dmxinput.h"
#include "dmxsync.h" #include "dmxsync.h"
#include "dmxscrinit.h" #include "dmxscrinit.h"
@ -896,13 +894,11 @@ static void dmxBECreateResources(pointer value, XID id, RESTYPE type,
if (pCmap->pScreen->myNum == scrnNum) if (pCmap->pScreen->myNum == scrnNum)
(void)dmxBECreateColormap((ColormapPtr)value); (void)dmxBECreateColormap((ColormapPtr)value);
#if 0 #if 0
#ifdef RENDER
/* TODO: Recreate Picture and GlyphSet resources */ /* TODO: Recreate Picture and GlyphSet resources */
} else if ((type & TypeMask) == (PictureType & TypeMask)) { } else if ((type & TypeMask) == (PictureType & TypeMask)) {
/* Picture resources are created when windows are created */ /* Picture resources are created when windows are created */
} else if ((type & TypeMask) == (GlyphSetType & TypeMask)) { } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value); dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);
#endif
#endif #endif
} else { } else {
/* Other resource types??? */ /* Other resource types??? */
@ -1057,7 +1053,6 @@ static Bool dmxCompareScreens(DMXScreenInfo *new, DMXScreenInfo *old)
return TRUE; return TRUE;
} }
#ifdef RENDER
/** Restore Render's picture */ /** Restore Render's picture */
static void dmxBERestoreRenderPict(pointer value, XID id, pointer n) static void dmxBERestoreRenderPict(pointer value, XID id, pointer n)
{ {
@ -1164,7 +1159,6 @@ static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n)
free(gids); free(gids);
free(glyphs); free(glyphs);
} }
#endif
/** Reattach previously detached back-end screen. */ /** Reattach previously detached back-end screen. */
int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr) int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
@ -1284,7 +1278,6 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
/* Create window hierarchy (top down) */ /* Create window hierarchy (top down) */
dmxBECreateWindowTree(idx); dmxBECreateWindowTree(idx);
#ifdef RENDER
/* Restore the picture state for RENDER */ /* Restore the picture state for RENDER */
for (i = currentMaxClients; --i >= 0; ) for (i = currentMaxClients; --i >= 0; )
if (clients[i]) if (clients[i])
@ -1296,7 +1289,6 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
if (clients[i]) if (clients[i])
FindClientResourcesByType(clients[i],GlyphSetType, FindClientResourcesByType(clients[i],GlyphSetType,
dmxBERestoreRenderGlyph,(pointer)idx); dmxBERestoreRenderGlyph,(pointer)idx);
#endif
/* Refresh screen by generating exposure events for all windows */ /* Refresh screen by generating exposure events for all windows */
dmxForceExposures(idx); dmxForceExposures(idx);
@ -1482,7 +1474,6 @@ static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type,
ColormapPtr pCmap = value; ColormapPtr pCmap = value;
if (pCmap->pScreen->myNum == scrnNum) if (pCmap->pScreen->myNum == scrnNum)
dmxBEFreeColormap((ColormapPtr)value); dmxBEFreeColormap((ColormapPtr)value);
#ifdef RENDER
} else if ((type & TypeMask) == (PictureType & TypeMask)) { } else if ((type & TypeMask) == (PictureType & TypeMask)) {
PicturePtr pPict = value; PicturePtr pPict = value;
if (pPict->pDrawable->pScreen->myNum == scrnNum) { if (pPict->pDrawable->pScreen->myNum == scrnNum) {
@ -1496,7 +1487,6 @@ static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type,
} }
} else if ((type & TypeMask) == (GlyphSetType & TypeMask)) { } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value); dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);
#endif
} else { } else {
/* Other resource types??? */ /* Other resource types??? */
} }

4
hw/dmx/dmxinit.c
View File

@ -53,9 +53,7 @@
#include "dmxcb.h" #include "dmxcb.h"
#include "dmxprop.h" #include "dmxprop.h"
#include "dmxstat.h" #include "dmxstat.h"
#ifdef RENDER
#include "dmxpict.h" #include "dmxpict.h"
#endif
#include <X11/Xos.h> /* For gettimeofday */ #include <X11/Xos.h> /* For gettimeofday */
#include "dixstruct.h" #include "dixstruct.h"
@ -795,11 +793,9 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
*/ */
dmxInitFonts(); dmxInitFonts();
#ifdef RENDER
/* Initialize the render extension */ /* Initialize the render extension */
if (!noRenderExtension) if (!noRenderExtension)
dmxInitRender(); dmxInitRender();
#endif
/* Initialized things that need timer hooks */ /* Initialized things that need timer hooks */
dmxStatInit(); dmxStatInit();

8
hw/dmx/dmxscrinit.c
View File

@ -53,9 +53,7 @@
#include "dmxprop.h" #include "dmxprop.h"
#include "dmxdpms.h" #include "dmxdpms.h"
#ifdef RENDER
#include "dmxpict.h" #include "dmxpict.h"
#endif
#include "fb.h" #include "fb.h"
#include "mipointer.h" #include "mipointer.h"
@ -78,12 +76,10 @@ static int dmxScreenPrivateKeyIndex;
DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKeyIndex; /**< Private index for Screens */ DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKeyIndex; /**< Private index for Screens */
static int dmxColormapPrivateKeyIndex; static int dmxColormapPrivateKeyIndex;
DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKeyIndex; /**< Private index for Colormaps */ DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKeyIndex; /**< Private index for Colormaps */
#ifdef RENDER
static int dmxPictPrivateKeyIndex; static int dmxPictPrivateKeyIndex;
DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKeyIndex; /**< Private index for Picts */ DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKeyIndex; /**< Private index for Picts */
static int dmxGlyphSetPrivateKeyIndex; static int dmxGlyphSetPrivateKeyIndex;
DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKeyIndex; /**< Private index for GlyphSets */ DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKeyIndex; /**< Private index for GlyphSets */
#endif
/** Initialize the parts of screen \a idx that require access to the /** Initialize the parts of screen \a idx that require access to the
* back-end server. */ * back-end server. */
@ -278,9 +274,7 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
dmxScreen->beXDPI, dmxScreen->beXDPI,
dmxScreen->scrnWidth, dmxScreen->scrnWidth,
dmxScreen->beBPP); dmxScreen->beBPP);
#ifdef RENDER
(void)dmxPictureInit(pScreen, 0, 0); (void)dmxPictureInit(pScreen, 0, 0);
#endif
/* Not yet... */ /* Not yet... */
pScreen->GetWindowPixmap = NULL; pScreen->GetWindowPixmap = NULL;
@ -435,9 +429,7 @@ Bool dmxCloseScreen(int idx, ScreenPtr pScreen)
/* Reset the proc vectors */ /* Reset the proc vectors */
if (idx == 0) { if (idx == 0) {
#ifdef RENDER
dmxResetRender(); dmxResetRender();
#endif
dmxResetFonts(); dmxResetFonts();
} }

8
hw/dmx/dmxwindow.c
View File

@ -46,9 +46,7 @@
#include "dmxvisual.h" #include "dmxvisual.h"
#include "dmxinput.h" #include "dmxinput.h"
#include "dmxextension.h" #include "dmxextension.h"
#ifdef RENDER
#include "dmxpict.h" #include "dmxpict.h"
#endif
#include "windowstr.h" #include "windowstr.h"
@ -288,9 +286,7 @@ void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync)
pWinPriv->window = dmxCreateNonRootWindow(pWindow); pWinPriv->window = dmxCreateNonRootWindow(pWindow);
if (pWinPriv->restacked) dmxDoRestackWindow(pWindow); if (pWinPriv->restacked) dmxDoRestackWindow(pWindow);
if (pWinPriv->isShaped) dmxDoSetShape(pWindow); if (pWinPriv->isShaped) dmxDoSetShape(pWindow);
#ifdef RENDER
if (pWinPriv->hasPict) dmxCreatePictureList(pWindow); if (pWinPriv->hasPict) dmxCreatePictureList(pWindow);
#endif
if (pWinPriv->mapped) XMapWindow(dmxScreen->beDisplay, if (pWinPriv->mapped) XMapWindow(dmxScreen->beDisplay,
pWinPriv->window); pWinPriv->window);
if (doSync) dmxSync(dmxScreen, False); if (doSync) dmxSync(dmxScreen, False);
@ -320,9 +316,7 @@ Bool dmxCreateWindow(WindowPtr pWindow)
pWinPriv->restacked = FALSE; pWinPriv->restacked = FALSE;
pWinPriv->attribMask = 0; pWinPriv->attribMask = 0;
pWinPriv->isShaped = FALSE; pWinPriv->isShaped = FALSE;
#ifdef RENDER
pWinPriv->hasPict = FALSE; pWinPriv->hasPict = FALSE;
#endif
#ifdef GLXEXT #ifdef GLXEXT
pWinPriv->swapGroup = NULL; pWinPriv->swapGroup = NULL;
pWinPriv->barrier = 0; pWinPriv->barrier = 0;
@ -405,10 +399,8 @@ Bool dmxDestroyWindow(WindowPtr pWindow)
DMX_UNWRAP(DestroyWindow, dmxScreen, pScreen); DMX_UNWRAP(DestroyWindow, dmxScreen, pScreen);
#ifdef RENDER
/* Destroy any picture list associated with this window */ /* Destroy any picture list associated with this window */
needSync |= dmxDestroyPictureList(pWindow); needSync |= dmxDestroyPictureList(pWindow);
#endif
/* Destroy window on back-end server */ /* Destroy window on back-end server */
needSync |= dmxBEDestroyWindow(pWindow); needSync |= dmxBEDestroyWindow(pWindow);

2
hw/dmx/dmxwindow.h
View File

@ -49,9 +49,7 @@ typedef struct _dmxWinPriv {
Colormap cmap; Colormap cmap;
Visual *visual; Visual *visual;
Bool isShaped; Bool isShaped;
#ifdef RENDER
Bool hasPict; Bool hasPict;
#endif
#ifdef GLXEXT #ifdef GLXEXT
void *swapGroup; void *swapGroup;
int barrier; int barrier;

2
hw/kdrive/src/kdrive.c
View File

@ -1003,10 +1003,8 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
pScreen->BlockHandler = KdBlockHandler; pScreen->BlockHandler = KdBlockHandler;
pScreen->WakeupHandler = KdWakeupHandler; pScreen->WakeupHandler = KdWakeupHandler;
#ifdef RENDER
if (!fbPictureInit (pScreen, 0, 0)) if (!fbPictureInit (pScreen, 0, 0))
return FALSE; return FALSE;
#endif
if (card->cfuncs->initScreen) if (card->cfuncs->initScreen)
if (!(*card->cfuncs->initScreen) (pScreen)) if (!(*card->cfuncs->initScreen) (pScreen))
return FALSE; return FALSE;

4
hw/vfb/InitOutput.c
View File

@ -248,10 +248,8 @@ ddxUseMsg(void)
{ {
ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-screen scrn WxHxD set screen's width, height, depth\n");
ErrorF("-pixdepths list-of-int support given pixmap depths\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n");
#ifdef RENDER
ErrorF("+/-render turn on/of RENDER extension support" ErrorF("+/-render turn on/of RENDER extension support"
"(default on)\n"); "(default on)\n");
#endif
ErrorF("-linebias n adjust thin line pixelization\n"); ErrorF("-linebias n adjust thin line pixelization\n");
ErrorF("-blackpixel n pixel value for black\n"); ErrorF("-blackpixel n pixel value for black\n");
ErrorF("-whitepixel n pixel value for white\n"); ErrorF("-whitepixel n pixel value for white\n");
@ -904,10 +902,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel); dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel);
#ifdef RENDER
if (ret && Render) if (ret && Render)
fbPictureInit (pScreen, 0, 0); fbPictureInit (pScreen, 0, 0);
#endif
if (!ret) return FALSE; if (!ret) return FALSE;

4
hw/xfree86/common/xf86Config.c
View File

@ -67,9 +67,7 @@ extern DeviceAssocRec mouse_assoc;
#include "xkbsrv.h" #include "xkbsrv.h"
#ifdef RENDER
#include "picture.h" #include "picture.h"
#endif
/* /*
* These paths define the way the config file search is done. The escape * These paths define the way the config file search is done. The escape
@ -925,7 +923,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
} }
} }
#ifdef RENDER
{ {
if ((s = xf86GetOptValString(FlagOptions, FLAG_RENDER_COLORMAP_MODE))){ if ((s = xf86GetOptValString(FlagOptions, FLAG_RENDER_COLORMAP_MODE))){
int policy = PictureParseCmapPolicy (s); int policy = PictureParseCmapPolicy (s);
@ -938,7 +935,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
} }
} }
} }
#endif
#ifdef RANDR #ifdef RANDR
xf86Info.disableRandR = FALSE; xf86Info.disableRandR = FALSE;

10
hw/xfree86/common/xf86Init.c
View File

@ -74,9 +74,7 @@
#include "xf86DDC.h" #include "xf86DDC.h"
#include "xf86Xinput.h" #include "xf86Xinput.h"
#include "xf86InPriv.h" #include "xf86InPriv.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
#include "xf86VGAarbiter.h" #include "xf86VGAarbiter.h"
#include "globals.h" #include "globals.h"
@ -110,15 +108,9 @@ static PixmapFormatRec formats[MAXFORMATS] = {
{ 15, 16, BITMAP_SCANLINE_PAD }, { 15, 16, BITMAP_SCANLINE_PAD },
{ 16, 16, BITMAP_SCANLINE_PAD }, { 16, 16, BITMAP_SCANLINE_PAD },
{ 24, 32, BITMAP_SCANLINE_PAD }, { 24, 32, BITMAP_SCANLINE_PAD },
#ifdef RENDER
{ 32, 32, BITMAP_SCANLINE_PAD }, { 32, 32, BITMAP_SCANLINE_PAD },
#endif
}; };
#ifdef RENDER
static int numFormats = 7; static int numFormats = 7;
#else
static int numFormats = 6;
#endif
static Bool formatsDone = FALSE; static Bool formatsDone = FALSE;
#ifndef OSNAME #ifndef OSNAME
@ -1082,7 +1074,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
xf86Screens[i]->pScreen->CreateWindow); xf86Screens[i]->pScreen->CreateWindow);
xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow; xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;
#ifdef RENDER
if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown) if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown)
{ {
xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC); xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC);
@ -1092,7 +1083,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
SubPixelHorizontalRGB : SubPixelNone) : SubPixelHorizontalRGB : SubPixelNone) :
SubPixelUnknown); SubPixelUnknown);
} }
#endif
#ifdef RANDR #ifdef RANDR
if (!xf86Info.disableRandR) if (!xf86Info.disableRandR)
xf86RandRInit (screenInfo.screens[scr_index]); xf86RandRInit (screenInfo.screens[scr_index]);

12
hw/xfree86/common/xf86VGAarbiter.c
View File

@ -151,9 +151,7 @@ xf86VGAarbiterWrapFunctions(void)
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;
VGAarbiterScreenPtr pScreenPriv; VGAarbiterScreenPtr pScreenPriv;
miPointerScreenPtr PointPriv; miPointerScreenPtr PointPriv;
#ifdef RENDER
PictureScreenPtr ps; PictureScreenPtr ps;
#endif
ScreenPtr pScreen; ScreenPtr pScreen;
int vga_count, i; int vga_count, i;
@ -173,9 +171,7 @@ xf86VGAarbiterWrapFunctions(void)
for (i = 0; i < xf86NumScreens; i++) { for (i = 0; i < xf86NumScreens; i++) {
pScreen = xf86Screens[i]->pScreen; pScreen = xf86Screens[i]->pScreen;
#ifdef RENDER
ps = GetPictureScreenIfSet(pScreen); ps = GetPictureScreenIfSet(pScreen);
#endif
pScrn = xf86Screens[pScreen->myNum]; pScrn = xf86Screens[pScreen->myNum];
PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey); PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
@ -204,11 +200,9 @@ xf86VGAarbiterWrapFunctions(void)
WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor); WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor);
WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor); WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor);
WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition); WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition);
#ifdef RENDER
WRAP_PICT(Composite,VGAarbiterComposite); WRAP_PICT(Composite,VGAarbiterComposite);
WRAP_PICT(Glyphs,VGAarbiterGlyphs); WRAP_PICT(Glyphs,VGAarbiterGlyphs);
WRAP_PICT(CompositeRects,VGAarbiterCompositeRects); WRAP_PICT(CompositeRects,VGAarbiterCompositeRects);
#endif
WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame); WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame);
WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode); WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode);
WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT); WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT);
@ -230,9 +224,7 @@ VGAarbiterCloseScreen (int i, ScreenPtr pScreen)
&pScreen->devPrivates, VGAarbiterScreenKey); &pScreen->devPrivates, VGAarbiterScreenKey);
miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate( miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
&pScreen->devPrivates, miPointerScreenKey); &pScreen->devPrivates, miPointerScreenKey);
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
#endif
UNWRAP_SCREEN(CreateGC); UNWRAP_SCREEN(CreateGC);
UNWRAP_SCREEN(CloseScreen); UNWRAP_SCREEN(CloseScreen);
@ -248,11 +240,9 @@ VGAarbiterCloseScreen (int i, ScreenPtr pScreen)
UNWRAP_SCREEN(UnrealizeCursor); UNWRAP_SCREEN(UnrealizeCursor);
UNWRAP_SCREEN(RecolorCursor); UNWRAP_SCREEN(RecolorCursor);
UNWRAP_SCREEN(SetCursorPosition); UNWRAP_SCREEN(SetCursorPosition);
#ifdef RENDER
UNWRAP_PICT(Composite); UNWRAP_PICT(Composite);
UNWRAP_PICT(Glyphs); UNWRAP_PICT(Glyphs);
UNWRAP_PICT(CompositeRects); UNWRAP_PICT(CompositeRects);
#endif
UNWRAP_SCREEN_INFO(AdjustFrame); UNWRAP_SCREEN_INFO(AdjustFrame);
UNWRAP_SCREEN_INFO(SwitchMode); UNWRAP_SCREEN_INFO(SwitchMode);
UNWRAP_SCREEN_INFO(EnterVT); UNWRAP_SCREEN_INFO(EnterVT);
@ -1048,7 +1038,6 @@ VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
SPRITE_EPILOG; SPRITE_EPILOG;
} }
#ifdef RENDER
static void static void
VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask,
@ -1097,7 +1086,6 @@ VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRe
VGAPut(); VGAPut();
PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects); PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects);
} }
#endif
#else #else
/* dummy functions */ /* dummy functions */
void xf86VGAarbiterInit(void) {} void xf86VGAarbiterInit(void) {}

6
hw/xfree86/common/xf86VGAarbiterPriv.h
View File

@ -43,9 +43,7 @@
#include "xf86str.h" #include "xf86str.h"
#include "mipointer.h" #include "mipointer.h"
#include "mipointrst.h" #include "mipointrst.h"
#ifdef RENDER
# include "picturestr.h" # include "picturestr.h"
#endif
#define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;} #define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;}
@ -139,11 +137,9 @@ typedef struct _VGAarbiterScreen {
void (*LeaveVT)(int, int); void (*LeaveVT)(int, int);
void (*FreeScreen)(int, int); void (*FreeScreen)(int, int);
miPointerSpriteFuncPtr miSprite; miPointerSpriteFuncPtr miSprite;
#ifdef RENDER
CompositeProcPtr Composite; CompositeProcPtr Composite;
GlyphsProcPtr Glyphs; GlyphsProcPtr Glyphs;
CompositeRectsProcPtr CompositeRects; CompositeRectsProcPtr CompositeRects;
#endif
} VGAarbiterScreenRec, *VGAarbiterScreenPtr; } VGAarbiterScreenRec, *VGAarbiterScreenPtr;
typedef struct _VGAarbiterGC { typedef struct _VGAarbiterGC {
@ -254,7 +250,6 @@ static Bool VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScree
static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen); static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
#ifdef RENDER
static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
INT16 xDst, INT16 yDst, CARD16 width, CARD16 height); INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
@ -263,4 +258,3 @@ static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
list, GlyphPtr *glyphs); list, GlyphPtr *glyphs);
static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor
*color, int nRect, xRectangle *rects); *color, int nRect, xRectangle *rects);
#endif

4
hw/xfree86/modes/xf86Crtc.c
View File

@ -42,9 +42,7 @@
#include "X11/extensions/render.h" #include "X11/extensions/render.h"
#include "X11/extensions/dpmsconst.h" #include "X11/extensions/dpmsconst.h"
#include "X11/Xatom.h" #include "X11/Xatom.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
#include "xf86xv.h" #include "xf86xv.h"
@ -184,7 +182,6 @@ xf86CrtcInUse (xf86CrtcPtr crtc)
void void
xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
{ {
#ifdef RENDER
int subpixel_order = SubPixelUnknown; int subpixel_order = SubPixelUnknown;
Bool has_none = FALSE; Bool has_none = FALSE;
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
@ -243,7 +240,6 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
if (subpixel_order == SubPixelUnknown && has_none) if (subpixel_order == SubPixelUnknown && has_none)
subpixel_order = SubPixelNone; subpixel_order = SubPixelNone;
PictureSetSubpixelOrder (pScreen, subpixel_order); PictureSetSubpixelOrder (pScreen, subpixel_order);
#endif
} }
/** /**

2
hw/xfree86/modes/xf86Cursors.c
View File

@ -41,9 +41,7 @@
#include "X11/extensions/render.h" #include "X11/extensions/render.h"
#include "X11/extensions/dpmsconst.h" #include "X11/extensions/dpmsconst.h"
#include "X11/Xatom.h" #include "X11/Xatom.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
#include "cursorstr.h" #include "cursorstr.h"
#include "inputstr.h" #include "inputstr.h"

16
hw/xfree86/shadowfb/shadow.c
View File

@ -27,9 +27,7 @@
#include "xf86str.h" #include "xf86str.h"
#include "shadowfb.h" #include "shadowfb.h"
#ifdef RENDER
# include "picturestr.h" # include "picturestr.h"
#endif
static Bool ShadowCloseScreen (int i, ScreenPtr pScreen); static Bool ShadowCloseScreen (int i, ScreenPtr pScreen);
static void ShadowCopyWindow( static void ShadowCopyWindow(
@ -51,7 +49,6 @@ static Bool ShadowModifyPixmapHeader(
static Bool ShadowEnterVT(int index, int flags); static Bool ShadowEnterVT(int index, int flags);
static void ShadowLeaveVT(int index, int flags); static void ShadowLeaveVT(int index, int flags);
#ifdef RENDER
static void ShadowComposite( static void ShadowComposite(
CARD8 op, CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
@ -66,7 +63,6 @@ static void ShadowComposite(
CARD16 width, CARD16 width,
CARD16 height CARD16 height
); );
#endif /* RENDER */
typedef struct { typedef struct {
@ -77,9 +73,7 @@ typedef struct {
CopyWindowProcPtr CopyWindow; CopyWindowProcPtr CopyWindow;
CreateGCProcPtr CreateGC; CreateGCProcPtr CreateGC;
ModifyPixmapHeaderProcPtr ModifyPixmapHeader; ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
#ifdef RENDER
CompositeProcPtr Composite; CompositeProcPtr Composite;
#endif /* RENDER */
Bool (*EnterVT)(int, int); Bool (*EnterVT)(int, int);
void (*LeaveVT)(int, int); void (*LeaveVT)(int, int);
Bool vtSema; Bool vtSema;
@ -164,9 +158,7 @@ ShadowFBInit2 (
){ ){
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ShadowScreenPtr pPriv; ShadowScreenPtr pPriv;
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
#endif /* RENDER */
if(!preRefreshArea && !postRefreshArea) return FALSE; if(!preRefreshArea && !postRefreshArea) return FALSE;
@ -199,12 +191,10 @@ ShadowFBInit2 (
pScrn->EnterVT = ShadowEnterVT; pScrn->EnterVT = ShadowEnterVT;
pScrn->LeaveVT = ShadowLeaveVT; pScrn->LeaveVT = ShadowLeaveVT;
#ifdef RENDER
if(ps) { if(ps) {
pPriv->Composite = ps->Composite; pPriv->Composite = ps->Composite;
ps->Composite = ShadowComposite; ps->Composite = ShadowComposite;
} }
#endif /* RENDER */
return TRUE; return TRUE;
} }
@ -251,9 +241,7 @@ ShadowCloseScreen (int i, ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen); ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
#endif /* RENDER */
pScreen->CloseScreen = pPriv->CloseScreen; pScreen->CloseScreen = pPriv->CloseScreen;
pScreen->CopyWindow = pPriv->CopyWindow; pScreen->CopyWindow = pPriv->CopyWindow;
@ -263,11 +251,9 @@ ShadowCloseScreen (int i, ScreenPtr pScreen)
pScrn->EnterVT = pPriv->EnterVT; pScrn->EnterVT = pPriv->EnterVT;
pScrn->LeaveVT = pPriv->LeaveVT; pScrn->LeaveVT = pPriv->LeaveVT;
#ifdef RENDER
if(ps) { if(ps) {
ps->Composite = pPriv->Composite; ps->Composite = pPriv->Composite;
} }
#endif /* RENDER */
xfree((pointer)pPriv); xfree((pointer)pPriv);
@ -355,7 +341,6 @@ ShadowModifyPixmapHeader(
return retval; return retval;
} }
#ifdef RENDER
static void static void
ShadowComposite( ShadowComposite(
CARD8 op, CARD8 op,
@ -408,7 +393,6 @@ ShadowComposite(
(*pPriv->postRefresh)(pPriv->pScrn, 1, &box); (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);
} }
} }
#endif /* RENDER */
/**********************************************************/ /**********************************************************/

7
hw/xfree86/xaa/xaa.h
View File

@ -108,9 +108,7 @@
#include "regionstr.h" #include "regionstr.h"
#include "xf86fbman.h" #include "xf86fbman.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
/* Flags */ /* Flags */
#define PIXMAP_CACHE 0x00000001 #define PIXMAP_CACHE 0x00000001
@ -1251,7 +1249,6 @@ typedef struct _XAAInfoRec {
CARD32 FullPlanemasks[32]; CARD32 FullPlanemasks[32];
#ifdef RENDER
Bool (*Composite) ( Bool (*Composite) (
CARD8 op, CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
@ -1336,13 +1333,10 @@ typedef struct _XAAInfoRec {
CARD32 * CPUToScreenTextureFormats; CARD32 * CPUToScreenTextureFormats;
#endif
/* these were added for 4.3.0 */ /* these were added for 4.3.0 */
BoxRec SolidLineLimits; BoxRec SolidLineLimits;
BoxRec DashedLineLimits; BoxRec DashedLineLimits;
#ifdef RENDER
/* These were added for X.Org 6.8.0 */ /* These were added for X.Org 6.8.0 */
Bool (*SetupForCPUToScreenAlphaTexture2) ( Bool (*SetupForCPUToScreenAlphaTexture2) (
ScrnInfoPtr pScrn, ScrnInfoPtr pScrn,
@ -1373,7 +1367,6 @@ typedef struct _XAAInfoRec {
int flags int flags
); );
CARD32 *CPUToScreenTextureDstFormats; CARD32 *CPUToScreenTextureDstFormats;
#endif /* RENDER */
} XAAInfoRec, *XAAInfoRecPtr; } XAAInfoRec, *XAAInfoRecPtr;
#define SET_SYNC_FLAG(infoRec) (infoRec)->NeedToSync = TRUE #define SET_SYNC_FLAG(infoRec) (infoRec)->NeedToSync = TRUE

4
hw/xfree86/xaa/xaaInit.c
View File

@ -100,9 +100,7 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
XAAScreenPtr pScreenPriv; XAAScreenPtr pScreenPriv;
int i; int i;
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
#endif
/* Return successfully if no acceleration wanted */ /* Return successfully if no acceleration wanted */
if (!infoRec) if (!infoRec)
@ -173,7 +171,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
pScrn->EnableDisableFBAccess = XAAEnableDisableFBAccess; pScrn->EnableDisableFBAccess = XAAEnableDisableFBAccess;
pScreenPriv->WindowExposures = pScreen->WindowExposures; pScreenPriv->WindowExposures = pScreen->WindowExposures;
#ifdef RENDER
if (ps) if (ps)
{ {
pScreenPriv->Composite = ps->Composite; pScreenPriv->Composite = ps->Composite;
@ -181,7 +178,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
pScreenPriv->Glyphs = ps->Glyphs; pScreenPriv->Glyphs = ps->Glyphs;
ps->Glyphs = XAAGlyphs; ps->Glyphs = XAAGlyphs;
} }
#endif
if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR) if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR)
XAASetupOverlay8_32Planar(pScreen); XAASetupOverlay8_32Planar(pScreen);

2
hw/xfree86/xaa/xaaInitAccel.c
View File

@ -1251,7 +1251,6 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
infoRec->ComputeDash = XAAComputeDash; infoRec->ComputeDash = XAAComputeDash;
} }
#ifdef RENDER
{ {
Bool haveTexture = infoRec->CPUToScreenTextureFormats && Bool haveTexture = infoRec->CPUToScreenTextureFormats &&
infoRec->CPUToScreenTextureDstFormats && infoRec->CPUToScreenTextureDstFormats &&
@ -1271,7 +1270,6 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
infoRec->Glyphs = XAADoGlyphs; infoRec->Glyphs = XAADoGlyphs;
} }
} }
#endif
/************ Validation Functions **************/ /************ Validation Functions **************/

6
hw/xfree86/xaa/xaaStateChange.c
View File

@ -260,7 +260,6 @@ typedef struct _XAAStateWrapRec {
GetImageProcPtr GetImage; GetImageProcPtr GetImage;
GetSpansProcPtr GetSpans; GetSpansProcPtr GetSpans;
CopyWindowProcPtr CopyWindow; CopyWindowProcPtr CopyWindow;
#ifdef RENDER
Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op, Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op,
CARD16 red, CARD16 green, CARD16 red, CARD16 green,
CARD16 blue, CARD16 alpha, CARD16 blue, CARD16 alpha,
@ -271,7 +270,6 @@ typedef struct _XAAStateWrapRec {
CARD32 srcFormat, CARD32 dstFormat, CARD32 srcFormat, CARD32 dstFormat,
CARD8 *texPtr, int texPitch, CARD8 *texPtr, int texPitch,
int width, int height, int flags); int width, int height, int flags);
#endif
} XAAStateWrapRec, *XAAStateWrapPtr; } XAAStateWrapRec, *XAAStateWrapPtr;
static int XAAStateKeyIndex; static int XAAStateKeyIndex;
@ -1457,7 +1455,6 @@ static void XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
prgnSrc); prgnSrc);
} }
#ifdef RENDER
static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn, static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn,
int op, CARD16 red, int op, CARD16 red,
CARD16 green, CARD16 green,
@ -1494,7 +1491,6 @@ static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op,
dstFormat, texPtr, texPitch, dstFormat, texPtr, texPitch,
width, height, flags); width, height, flags);
} }
#endif
/* Setup Function */ /* Setup Function */
Bool Bool
@ -1624,9 +1620,7 @@ XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
XAA_STATE_WRAP(GetImage); XAA_STATE_WRAP(GetImage);
XAA_STATE_WRAP(GetSpans); XAA_STATE_WRAP(GetSpans);
XAA_STATE_WRAP(CopyWindow); XAA_STATE_WRAP(CopyWindow);
#ifdef RENDER
XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2); XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2);
XAA_STATE_WRAP(SetupForCPUToScreenTexture2); XAA_STATE_WRAP(SetupForCPUToScreenTexture2);
#endif
return TRUE; return TRUE;
} }

12
hw/xfree86/xaa/xaaWrapper.c
View File

@ -62,10 +62,8 @@ typedef struct {
UninstallColormapProcPtr UninstallColormap; UninstallColormapProcPtr UninstallColormap;
ListInstalledColormapsProcPtr ListInstalledColormaps; ListInstalledColormapsProcPtr ListInstalledColormaps;
StoreColorsProcPtr StoreColors; StoreColorsProcPtr StoreColors;
#ifdef RENDER
CompositeProcPtr Composite; CompositeProcPtr Composite;
GlyphsProcPtr Glyphs; GlyphsProcPtr Glyphs;
#endif
CloseScreenProcPtr wrapCloseScreen; CloseScreenProcPtr wrapCloseScreen;
CreateScreenResourcesProcPtr wrapCreateScreenResources; CreateScreenResourcesProcPtr wrapCreateScreenResources;
@ -79,10 +77,8 @@ typedef struct {
UninstallColormapProcPtr wrapUninstallColormap; UninstallColormapProcPtr wrapUninstallColormap;
ListInstalledColormapsProcPtr wrapListInstalledColormaps; ListInstalledColormapsProcPtr wrapListInstalledColormaps;
StoreColorsProcPtr wrapStoreColors; StoreColorsProcPtr wrapStoreColors;
#ifdef RENDER
CompositeProcPtr wrapComposite; CompositeProcPtr wrapComposite;
GlyphsProcPtr wrapGlyphs; GlyphsProcPtr wrapGlyphs;
#endif
int depth; int depth;
} xaaWrapperScrPrivRec, *xaaWrapperScrPrivPtr; } xaaWrapperScrPrivRec, *xaaWrapperScrPrivPtr;
@ -270,9 +266,7 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
{ {
Bool ret; Bool ret;
xaaWrapperScrPrivPtr pScrPriv; xaaWrapperScrPrivPtr pScrPriv;
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
#endif
if (!dixRequestPrivate(xaaWrapperGCPrivateKey, sizeof(xaaWrapperGCPrivRec))) if (!dixRequestPrivate(xaaWrapperGCPrivateKey, sizeof(xaaWrapperGCPrivRec)))
return FALSE; return FALSE;
@ -293,12 +287,10 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
get (pScrPriv, pScreen, UninstallColormap, wrapUninstallColormap); get (pScrPriv, pScreen, UninstallColormap, wrapUninstallColormap);
get (pScrPriv, pScreen, ListInstalledColormaps, wrapListInstalledColormaps); get (pScrPriv, pScreen, ListInstalledColormaps, wrapListInstalledColormaps);
get (pScrPriv, pScreen, StoreColors, wrapStoreColors); get (pScrPriv, pScreen, StoreColors, wrapStoreColors);
#ifdef RENDER
if (ps) { if (ps) {
get (pScrPriv, ps, Glyphs, wrapGlyphs); get (pScrPriv, ps, Glyphs, wrapGlyphs);
get (pScrPriv, ps, Composite, wrapComposite); get (pScrPriv, ps, Composite, wrapComposite);
} }
#endif
if (!(ret = XAAInit(pScreen,infoPtr))) if (!(ret = XAAInit(pScreen,infoPtr)))
return FALSE; return FALSE;
@ -317,12 +309,10 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
xaaWrapperListInstalledColormaps); xaaWrapperListInstalledColormaps);
wrap (pScrPriv, pScreen, StoreColors, xaaWrapperStoreColors); wrap (pScrPriv, pScreen, StoreColors, xaaWrapperStoreColors);
#ifdef RENDER
if (ps) { if (ps) {
wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs); wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs);
wrap (pScrPriv, ps, Composite, xaaWrapperComposite); wrap (pScrPriv, ps, Composite, xaaWrapperComposite);
} }
#endif
pScrPriv->depth = depth; pScrPriv->depth = depth;
dixSetPrivate(&pScreen->devPrivates, xaaWrapperScrPrivateKey, pScrPriv); dixSetPrivate(&pScreen->devPrivates, xaaWrapperScrPrivateKey, pScrPriv);
@ -438,7 +428,6 @@ xaaWrapperDestroyClip(GCPtr pGC)
XAAWRAPPER_GC_FUNC_EPILOGUE (pGC); XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);
} }
#ifdef RENDER
static void static void
xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
@ -470,7 +459,6 @@ xaaWrapperGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs); wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs);
} }
#endif
void void
XAASync(ScreenPtr pScreen) XAASync(ScreenPtr pScreen)

7
hw/xfree86/xaa/xaalocal.h
View File

@ -10,9 +10,7 @@
#include "xf86fbman.h" #include "xf86fbman.h"
#include "xaa.h" #include "xaa.h"
#include "mi.h" #include "mi.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
#define GCWhenForced (GCArcMode << 1) #define GCWhenForced (GCArcMode << 1)
@ -55,10 +53,8 @@ typedef struct _XAAScreen {
void (*LeaveVT)(int, int); void (*LeaveVT)(int, int);
int (*SetDGAMode)(int, int, DGADevicePtr); int (*SetDGAMode)(int, int, DGADevicePtr);
void (*EnableDisableFBAccess)(int, Bool); void (*EnableDisableFBAccess)(int, Bool);
#ifdef RENDER
CompositeProcPtr Composite; CompositeProcPtr Composite;
GlyphsProcPtr Glyphs; GlyphsProcPtr Glyphs;
#endif
} XAAScreenRec, *XAAScreenPtr; } XAAScreenRec, *XAAScreenPtr;
#define OPS_ARE_PIXMAP 0x00000001 #define OPS_ARE_PIXMAP 0x00000001
@ -1539,7 +1535,6 @@ extern _X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area);
extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix); extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix);
extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec); extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
#ifdef RENDER
extern _X_EXPORT void extern _X_EXPORT void
XAAComposite (CARD8 op, XAAComposite (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,
@ -1627,8 +1622,6 @@ XAAGetPixelFromRGBA (
CARD32 format CARD32 format
); );
#endif
/* XXX should be static */ /* XXX should be static */
extern _X_EXPORT GCOps XAAFallbackOps; extern _X_EXPORT GCOps XAAFallbackOps;
extern _X_EXPORT GCOps *XAAGetFallbackOps(void); extern _X_EXPORT GCOps *XAAGetFallbackOps(void);

2
hw/xfree86/xaa/xaawrap.h
View File

@ -61,14 +61,12 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef RENDER
#define XAA_RENDER_PROLOGUE(pScreen,field)\ #define XAA_RENDER_PROLOGUE(pScreen,field)\
(GetPictureScreen(pScreen)->field = \ (GetPictureScreen(pScreen)->field = \
((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field) ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
#define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\ #define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\
(GetPictureScreen(pScreen)->field = wrapper) (GetPictureScreen(pScreen)->field = wrapper)
#endif
/* This also works fine for drawables */ /* This also works fine for drawables */

2
hw/xquartz/darwin.c
View File

@ -240,11 +240,9 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv
return FALSE; return FALSE;
} }
#ifdef RENDER
if (! fbPictureInit(pScreen, 0, 0)) { if (! fbPictureInit(pScreen, 0, 0)) {
return FALSE; return FALSE;
} }
#endif
#ifdef MITSHM #ifdef MITSHM
ShmRegisterFbFuncs(pScreen); ShmRegisterFbFuncs(pScreen);

2
hw/xquartz/mach-startup/launchd_fd.h
View File

@ -33,4 +33,4 @@
int launchd_display_fd(void); int launchd_display_fd(void);
#endif /* _XQUARTZ_LAUNCHD_FD_H_ */ #endif /* _XQUARTZ_LAUNCHD_FD_H_ */

2
hw/xwin/InitOutput.c
View File

@ -155,9 +155,7 @@ static PixmapFormatRec g_PixmapFormats[] = {
{ 15, 16, BITMAP_SCANLINE_PAD }, { 15, 16, BITMAP_SCANLINE_PAD },
{ 16, 16, BITMAP_SCANLINE_PAD }, { 16, 16, BITMAP_SCANLINE_PAD },
{ 24, 32, BITMAP_SCANLINE_PAD }, { 24, 32, BITMAP_SCANLINE_PAD },
#ifdef RENDER
{ 32, 32, BITMAP_SCANLINE_PAD } { 32, 32, BITMAP_SCANLINE_PAD }
#endif
}; };
const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]); const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]);

2
hw/xwin/win.h
View File

@ -183,10 +183,8 @@
#include "fb.h" #include "fb.h"
#include "rootless.h" #include "rootless.h"
#ifdef RENDER
#include "mipict.h" #include "mipict.h"
#include "picturestr.h" #include "picturestr.h"
#endif
#ifdef RANDR #ifdef RANDR
#include "randrstr.h" #include "randrstr.h"

2
hw/xwin/winscrinit.c
View File

@ -390,14 +390,12 @@ winFinishScreenInitFB (int index,
pScreen->blockData = pScreen; pScreen->blockData = pScreen;
pScreen->wakeupData = pScreen; pScreen->wakeupData = pScreen;
#ifdef RENDER
/* Render extension initialization, calls miPictureInit */ /* Render extension initialization, calls miPictureInit */
if (!fbPictureInit (pScreen, NULL, 0)) if (!fbPictureInit (pScreen, NULL, 0))
{ {
ErrorF ("winFinishScreenInitFB - fbPictureInit () failed\n"); ErrorF ("winFinishScreenInitFB - fbPictureInit () failed\n");
return FALSE; return FALSE;
} }
#endif
#ifdef RANDR #ifdef RANDR
/* Initialize resize and rotate support */ /* Initialize resize and rotate support */

7
hw/xwin/winwin32rootless.c
View File

@ -894,9 +894,6 @@ winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage)
SIZE szWin; SIZE szWin;
POINT ptSrc; POINT ptSrc;
#endif #endif
#if CYGMULTIWINDOW_DEBUG && 0
winDebug ("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
#endif
#if 0 #if 0
szWin.cx = pRLWinPriv->dwWidth; szWin.cx = pRLWinPriv->dwWidth;
szWin.cy = pRLWinPriv->dwHeight; szWin.cy = pRLWinPriv->dwHeight;
@ -938,10 +935,6 @@ winMWExtWMDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRects,
{ {
win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid; win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
const BoxRec *pEnd; const BoxRec *pEnd;
#if CYGMULTIWINDOW_DEBUG && 0
winDebug ("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
pRLWinPriv, nCount, pRects, shift_x, shift_y);
#endif
for (pEnd = pRects + nCount; pRects < pEnd; pRects++) { for (pEnd = pRects + nCount; pRects < pEnd; pRects++) {
RECT rcDmg; RECT rcDmg;

6
hw/xwin/winwin32rootlesswndproc.c
View File

@ -519,9 +519,6 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
break; break;
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
#if CYGMULTIWINDOW_DEBUG && 0
winDebug ("winMWExtWMWindowProc - WM_MOUSEMOVE\n");
#endif
/* Unpack the client area mouse coordinates */ /* Unpack the client area mouse coordinates */
ptMouse.x = GET_X_LPARAM(lParam); ptMouse.x = GET_X_LPARAM(lParam);
ptMouse.y = GET_Y_LPARAM(lParam); ptMouse.y = GET_Y_LPARAM(lParam);
@ -576,9 +573,6 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
return 0; return 0;
case WM_NCMOUSEMOVE: case WM_NCMOUSEMOVE:
#if CYGMULTIWINDOW_DEBUG && 0
winDebug ("winMWExtWMWindowProc - WM_NCMOUSEMOVE\n");
#endif
/* /*
* We break instead of returning 0 since we need to call * We break instead of returning 0 since we need to call
* DefWindowProc to get the mouse cursor changes * DefWindowProc to get the mouse cursor changes

2
include/cursor.h
View File

@ -55,9 +55,7 @@ SOFTWARE.
#define NullCursor ((CursorPtr)NULL) #define NullCursor ((CursorPtr)NULL)
/* Provide support for alpha composited cursors */ /* Provide support for alpha composited cursors */
#ifdef RENDER
#define ARGB_CURSOR #define ARGB_CURSOR
#endif
struct _DeviceIntRec; struct _DeviceIntRec;

2
include/globals.h
View File

@ -77,9 +77,7 @@ extern _X_EXPORT Bool noMultibufferExtension;
extern _X_EXPORT Bool noRRExtension; extern _X_EXPORT Bool noRRExtension;
#endif #endif
#ifdef RENDER
extern _X_EXPORT Bool noRenderExtension; extern _X_EXPORT Bool noRenderExtension;
#endif
#ifdef XCSECURITY #ifdef XCSECURITY
extern _X_EXPORT Bool noSecurityExtension; extern _X_EXPORT Bool noSecurityExtension;

10
mi/miinitext.c
View File

@ -122,9 +122,7 @@ extern Bool noMultibufferExtension;
#ifdef RANDR #ifdef RANDR
extern Bool noRRExtension; extern Bool noRRExtension;
#endif #endif
#ifdef RENDER
extern Bool noRenderExtension; extern Bool noRenderExtension;
#endif
#ifdef XCSECURITY #ifdef XCSECURITY
extern Bool noSecurityExtension; extern Bool noSecurityExtension;
#endif #endif
@ -252,9 +250,7 @@ extern void XFree86DRIExtensionInit(INITARGS);
#ifdef DPMSExtension #ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS); extern void DPMSExtensionInit(INITARGS);
#endif #endif
#ifdef RENDER
extern void RenderExtensionInit(INITARGS); extern void RenderExtensionInit(INITARGS);
#endif
#ifdef RANDR #ifdef RANDR
extern void RRExtensionInit(INITARGS); extern void RRExtensionInit(INITARGS);
#endif #endif
@ -314,9 +310,7 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef RANDR #ifdef RANDR
{ "RANDR", &noRRExtension }, { "RANDR", &noRRExtension },
#endif #endif
#ifdef RENDER
{ "RENDER", &noRenderExtension }, { "RENDER", &noRenderExtension },
#endif
#ifdef XCSECURITY #ifdef XCSECURITY
{ "SECURITY", &noSecurityExtension }, { "SECURITY", &noSecurityExtension },
#endif #endif
@ -469,9 +463,7 @@ InitExtensions(int argc, char *argv[])
/* must be before Render to layer DisplayCursor correctly */ /* must be before Render to layer DisplayCursor correctly */
if (!noXFixesExtension) XFixesExtensionInit(); if (!noXFixesExtension) XFixesExtensionInit();
#endif #endif
#ifdef RENDER
if (!noRenderExtension) RenderExtensionInit(); if (!noRenderExtension) RenderExtensionInit();
#endif
#ifdef RANDR #ifdef RANDR
if (!noRRExtension) RRExtensionInit(); if (!noRRExtension) RRExtensionInit();
#endif #endif
@ -524,9 +516,7 @@ static ExtensionModule staticExtensions[] = {
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
{ XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL }, { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
#endif #endif
#ifdef RENDER
{ RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL }, { RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL },
#endif
#ifdef RANDR #ifdef RANDR
{ RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL }, { RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL },
#endif #endif

10
miext/cw/cw.c
View File

@ -49,10 +49,8 @@ static int cwScreenKeyIndex;
DevPrivateKey cwScreenKey = &cwScreenKeyIndex; DevPrivateKey cwScreenKey = &cwScreenKeyIndex;
static int cwWindowKeyIndex; static int cwWindowKeyIndex;
DevPrivateKey cwWindowKey = &cwWindowKeyIndex; DevPrivateKey cwWindowKey = &cwWindowKeyIndex;
#ifdef RENDER
static int cwPictureKeyIndex; static int cwPictureKeyIndex;
DevPrivateKey cwPictureKey = &cwPictureKeyIndex; DevPrivateKey cwPictureKey = &cwPictureKeyIndex;
#endif
extern GCOps cwGCOps; extern GCOps cwGCOps;
static Bool static Bool
@ -477,9 +475,7 @@ void
miInitializeCompositeWrapper(ScreenPtr pScreen) miInitializeCompositeWrapper(ScreenPtr pScreen)
{ {
cwScreenPtr pScreenPriv; cwScreenPtr pScreenPriv;
#ifdef RENDER
Bool has_render = GetPictureScreenIfSet(pScreen) != NULL; Bool has_render = GetPictureScreenIfSet(pScreen) != NULL;
#endif
if (!dixRequestPrivate(cwGCKey, sizeof(cwGCRec))) if (!dixRequestPrivate(cwGCKey, sizeof(cwGCRec)))
return; return;
@ -499,19 +495,15 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
SCREEN_EPILOGUE(pScreen, SetWindowPixmap, cwSetWindowPixmap); SCREEN_EPILOGUE(pScreen, SetWindowPixmap, cwSetWindowPixmap);
SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap); SCREEN_EPILOGUE(pScreen, GetWindowPixmap, cwGetWindowPixmap);
#ifdef RENDER
if (has_render) if (has_render)
cwInitializeRender(pScreen); cwInitializeRender(pScreen);
#endif
} }
static Bool static Bool
cwCloseScreen (int i, ScreenPtr pScreen) cwCloseScreen (int i, ScreenPtr pScreen)
{ {
cwScreenPtr pScreenPriv; cwScreenPtr pScreenPriv;
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
#endif
pScreenPriv = (cwScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (cwScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
cwScreenKey); cwScreenKey);
@ -521,10 +513,8 @@ cwCloseScreen (int i, ScreenPtr pScreen)
pScreen->CreateGC = pScreenPriv->CreateGC; pScreen->CreateGC = pScreenPriv->CreateGC;
pScreen->CopyWindow = pScreenPriv->CopyWindow; pScreen->CopyWindow = pScreenPriv->CopyWindow;
#ifdef RENDER
if (ps) if (ps)
cwFiniRender(pScreen); cwFiniRender(pScreen);
#endif
xfree((pointer)pScreenPriv); xfree((pointer)pScreenPriv);

2
miext/cw/cw.h
View File

@ -90,7 +90,6 @@ typedef struct {
GetWindowPixmapProcPtr GetWindowPixmap; GetWindowPixmapProcPtr GetWindowPixmap;
SetWindowPixmapProcPtr SetWindowPixmap; SetWindowPixmapProcPtr SetWindowPixmap;
#ifdef RENDER
DestroyPictureProcPtr DestroyPicture; DestroyPictureProcPtr DestroyPicture;
ChangePictureClipProcPtr ChangePictureClip; ChangePictureClipProcPtr ChangePictureClip;
DestroyPictureClipProcPtr DestroyPictureClip; DestroyPictureClipProcPtr DestroyPictureClip;
@ -107,7 +106,6 @@ typedef struct {
TriFanProcPtr TriFan; TriFanProcPtr TriFan;
RasterizeTrapezoidProcPtr RasterizeTrapezoid; RasterizeTrapezoidProcPtr RasterizeTrapezoid;
#endif
} cwScreenRec, *cwScreenPtr; } cwScreenRec, *cwScreenPtr;
extern _X_EXPORT DevPrivateKey cwScreenKey; extern _X_EXPORT DevPrivateKey cwScreenKey;

3
miext/cw/cw_render.c
View File

@ -30,8 +30,6 @@
#include "windowstr.h" #include "windowstr.h"
#include "cw.h" #include "cw.h"
#ifdef RENDER
#define cwPsDecl(pScreen) \ #define cwPsDecl(pScreen) \
PictureScreenPtr ps = GetPictureScreen (pScreen); \ PictureScreenPtr ps = GetPictureScreen (pScreen); \
cwScreenPtr pCwScreen = getCwScreen (pScreen) cwScreenPtr pCwScreen = getCwScreen (pScreen)
@ -469,4 +467,3 @@ cwFiniRender (ScreenPtr pScreen)
cwPsUnwrap(TriFan); cwPsUnwrap(TriFan);
} }
#endif /* RENDER */

7
miext/damage/damage.c
View File

@ -596,8 +596,6 @@ damageDestroyClip(GCPtr pGC)
REGION_NOTEMPTY(d->pScreen, \ REGION_NOTEMPTY(d->pScreen, \
g->pCompositeClip))) g->pCompositeClip)))
#ifdef RENDER
#define TRIM_PICTURE_BOX(box, pDst) { \ #define TRIM_PICTURE_BOX(box, pDst) { \
BoxPtr extents = &pDst->pCompositeClip->extents;\ BoxPtr extents = &pDst->pCompositeClip->extents;\
if(box.x1 < extents->x1) box.x1 = extents->x1; \ if(box.x1 < extents->x1) box.x1 = extents->x1; \
@ -774,7 +772,6 @@ damageAddTraps (PicturePtr pPicture,
damageRegionProcessPending (pPicture->pDrawable); damageRegionProcessPending (pPicture->pDrawable);
wrap (pScrPriv, ps, AddTraps, damageAddTraps); wrap (pScrPriv, ps, AddTraps, damageAddTraps);
} }
#endif
/**********************************************************/ /**********************************************************/
@ -1882,9 +1879,7 @@ Bool
DamageSetup (ScreenPtr pScreen) DamageSetup (ScreenPtr pScreen)
{ {
DamageScrPrivPtr pScrPriv; DamageScrPrivPtr pScrPriv;
#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
#endif
const DamageScreenFuncsRec miFuncs = { const DamageScreenFuncsRec miFuncs = {
miDamageCreate, miDamageRegister, miDamageUnregister, miDamageDestroy miDamageCreate, miDamageRegister, miDamageUnregister, miDamageDestroy
}; };
@ -1908,13 +1903,11 @@ DamageSetup (ScreenPtr pScreen)
wrap (pScrPriv, pScreen, SetWindowPixmap, damageSetWindowPixmap); wrap (pScrPriv, pScreen, SetWindowPixmap, damageSetWindowPixmap);
wrap (pScrPriv, pScreen, CopyWindow, damageCopyWindow); wrap (pScrPriv, pScreen, CopyWindow, damageCopyWindow);
wrap (pScrPriv, pScreen, CloseScreen, damageCloseScreen); wrap (pScrPriv, pScreen, CloseScreen, damageCloseScreen);
#ifdef RENDER
if (ps) { if (ps) {
wrap (pScrPriv, ps, Glyphs, damageGlyphs); wrap (pScrPriv, ps, Glyphs, damageGlyphs);
wrap (pScrPriv, ps, Composite, damageComposite); wrap (pScrPriv, ps, Composite, damageComposite);
wrap (pScrPriv, ps, AddTraps, damageAddTraps); wrap (pScrPriv, ps, AddTraps, damageAddTraps);
} }
#endif
pScrPriv->funcs = miFuncs; pScrPriv->funcs = miFuncs;

4
miext/damage/damagestr.h
View File

@ -30,9 +30,7 @@
#include "damage.h" #include "damage.h"
#include "gcstruct.h" #include "gcstruct.h"
#include "privates.h" #include "privates.h"
#ifdef RENDER
# include "picturestr.h" # include "picturestr.h"
#endif
typedef struct _damage { typedef struct _damage {
DamagePtr pNext; DamagePtr pNext;
@ -72,11 +70,9 @@ typedef struct _damageScrPriv {
DestroyPixmapProcPtr DestroyPixmap; DestroyPixmapProcPtr DestroyPixmap;
SetWindowPixmapProcPtr SetWindowPixmap; SetWindowPixmapProcPtr SetWindowPixmap;
DestroyWindowProcPtr DestroyWindow; DestroyWindowProcPtr DestroyWindow;
#ifdef RENDER
CompositeProcPtr Composite; CompositeProcPtr Composite;
GlyphsProcPtr Glyphs; GlyphsProcPtr Glyphs;
AddTrapsProcPtr AddTraps; AddTrapsProcPtr AddTraps;
#endif
/* Table of wrappable function pointers */ /* Table of wrappable function pointers */
DamageScreenFuncsRec funcs; DamageScreenFuncsRec funcs;

4
miext/rootless/rootlessCommon.h
View File

@ -42,9 +42,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
// Debug output, or not. // Debug output, or not.
@ -100,10 +98,8 @@ typedef struct _RootlessScreenRec {
SetShapeProcPtr SetShape; SetShapeProcPtr SetShape;
#ifdef RENDER
CompositeProcPtr Composite; CompositeProcPtr Composite;
GlyphsProcPtr Glyphs; GlyphsProcPtr Glyphs;
#endif
InstallColormapProcPtr InstallColormap; InstallColormapProcPtr InstallColormap;
UninstallColormapProcPtr UninstallColormap; UninstallColormapProcPtr UninstallColormap;

6
miext/rootless/rootlessScreen.c
View File

@ -242,8 +242,6 @@ RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h)
SCREEN_WRAP(pDrawable->pScreen, SourceValidate); SCREEN_WRAP(pDrawable->pScreen, SourceValidate);
} }
#ifdef RENDER
static void static void
RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
@ -363,8 +361,6 @@ RootlessGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
} }
} }
#endif // RENDER
/* /*
* RootlessValidateTree * RootlessValidateTree
@ -698,7 +694,6 @@ RootlessWrap(ScreenPtr pScreen)
WRAP(SetShape); WRAP(SetShape);
#ifdef RENDER
{ {
// Composite and Glyphs don't use normal screen wrapping // Composite and Glyphs don't use normal screen wrapping
PictureScreenPtr ps = GetPictureScreen(pScreen); PictureScreenPtr ps = GetPictureScreen(pScreen);
@ -707,7 +702,6 @@ RootlessWrap(ScreenPtr pScreen)
s->Glyphs = ps->Glyphs; s->Glyphs = ps->Glyphs;
ps->Glyphs = RootlessGlyphs; ps->Glyphs = RootlessGlyphs;
} }
#endif
// WRAP(ClearToBackground); fixme put this back? useful for shaped wins? // WRAP(ClearToBackground); fixme put this back? useful for shaped wins?

2
miext/shadow/shadow.h
View File

@ -26,9 +26,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#ifdef RENDER
#include "picturestr.h" #include "picturestr.h"
#endif
#include "damage.h" #include "damage.h"
#include "damagestr.h" #include "damagestr.h"

8
os/utils.c
View File

@ -120,9 +120,7 @@ __stdcall unsigned long GetTickCount(void);
#include "xkbsrv.h" #include "xkbsrv.h"
#ifdef RENDER
#include "picture.h" #include "picture.h"
#endif
Bool noTestExtensions; Bool noTestExtensions;
#ifdef COMPOSITE #ifdef COMPOSITE
@ -154,9 +152,7 @@ Bool noMultibufferExtension = FALSE;
#ifdef RANDR #ifdef RANDR
Bool noRRExtension = FALSE; Bool noRRExtension = FALSE;
#endif #endif
#ifdef RENDER
Bool noRenderExtension = FALSE; Bool noRenderExtension = FALSE;
#endif
#ifdef XCSECURITY #ifdef XCSECURITY
Bool noSecurityExtension = FALSE; Bool noSecurityExtension = FALSE;
#endif #endif
@ -517,9 +513,7 @@ void UseMsg(void)
ErrorF("-nopn reject failure to listen on all ports\n"); ErrorF("-nopn reject failure to listen on all ports\n");
ErrorF("-r turns off auto-repeat\n"); ErrorF("-r turns off auto-repeat\n");
ErrorF("r turns on auto-repeat \n"); ErrorF("r turns on auto-repeat \n");
#ifdef RENDER
ErrorF("-render [default|mono|gray|color] set render color alloc policy\n"); ErrorF("-render [default|mono|gray|color] set render color alloc policy\n");
#endif
ErrorF("-retro start with classic stipple and cursor\n"); ErrorF("-retro start with classic stipple and cursor\n");
ErrorF("-s # screen-saver timeout (minutes)\n"); ErrorF("-s # screen-saver timeout (minutes)\n");
ErrorF("-t # default pointer threshold (pixels/t)\n"); ErrorF("-t # default pointer threshold (pixels/t)\n");
@ -920,7 +914,6 @@ ProcessCommandLine(int argc, char *argv[])
else else
UseMsg(); UseMsg();
} }
#ifdef RENDER
else if ( strcmp( argv[i], "-render" ) == 0) else if ( strcmp( argv[i], "-render" ) == 0)
{ {
if (++i < argc) if (++i < argc)
@ -935,7 +928,6 @@ ProcessCommandLine(int argc, char *argv[])
else else
UseMsg (); UseMsg ();
} }
#endif
else if ( strcmp( argv[i], "+extension") == 0) else if ( strcmp( argv[i], "+extension") == 0)
{ {
if (++i < argc) if (++i < argc)

2
randr/randrstr.h
View File

@ -47,10 +47,8 @@
#include "rrtransform.h" #include "rrtransform.h"
#include <X11/extensions/randr.h> #include <X11/extensions/randr.h>
#include <X11/extensions/randrproto.h> #include <X11/extensions/randrproto.h>
#ifdef RENDER
#include <X11/extensions/render.h> /* we share subpixel order information */ #include <X11/extensions/render.h> /* we share subpixel order information */
#include "picturestr.h" #include "picturestr.h"
#endif
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
/* required for ABI compatibility for now */ /* required for ABI compatibility for now */

2
randr/rrinfo.c
View File

@ -99,9 +99,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
return; return;
RROutputSetCrtcs (output, &crtc, 1); RROutputSetCrtcs (output, &crtc, 1);
RROutputSetConnection (output, RR_Connected); RROutputSetConnection (output, RR_Connected);
#ifdef RENDER
RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen)); RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
#endif
} }
output = pScrPriv->outputs[0]; output = pScrPriv->outputs[0];

4
randr/rrscreen.c
View File

@ -106,11 +106,7 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen)
se.configTimestamp = pScrPriv->lastConfigTime.milliseconds; se.configTimestamp = pScrPriv->lastConfigTime.milliseconds;
se.root = pRoot->drawable.id; se.root = pRoot->drawable.id;
se.window = pWin->drawable.id; se.window = pWin->drawable.id;
#ifdef RENDER
se.subpixelOrder = PictureGetSubpixelOrder (pScreen); se.subpixelOrder = PictureGetSubpixelOrder (pScreen);
#else
se.subpixelOrder = SubPixelUnknown;
#endif
se.sequenceNumber = client->sequence; se.sequenceNumber = client->sequence;
se.sizeID = RR10CurrentSizeID (pScreen); se.sizeID = RR10CurrentSizeID (pScreen);

10
xfixes/region.c
View File

@ -26,10 +26,8 @@
#include "xfixesint.h" #include "xfixesint.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#ifdef RENDER
#include <picturestr.h> #include <picturestr.h>
extern int RenderErrBase; extern int RenderErrBase;
#endif
#include <regionstr.h> #include <regionstr.h>
#include <gcstruct.h> #include <gcstruct.h>
#include <window.h> #include <window.h>
@ -265,7 +263,6 @@ SProcXFixesCreateRegionFromGC (ClientPtr client)
int int
ProcXFixesCreateRegionFromPicture (ClientPtr client) ProcXFixesCreateRegionFromPicture (ClientPtr client)
{ {
#ifdef RENDER
RegionPtr pRegion; RegionPtr pRegion;
PicturePtr pPicture; PicturePtr pPicture;
REQUEST (xXFixesCreateRegionFromPictureReq); REQUEST (xXFixesCreateRegionFromPictureReq);
@ -296,9 +293,6 @@ ProcXFixesCreateRegionFromPicture (ClientPtr client)
return BadAlloc; return BadAlloc;
return(client->noClientException); return(client->noClientException);
#else
return BadRequest;
#endif
} }
int int
@ -769,7 +763,6 @@ SProcXFixesSetWindowShapeRegion (ClientPtr client)
int int
ProcXFixesSetPictureClipRegion (ClientPtr client) ProcXFixesSetPictureClipRegion (ClientPtr client)
{ {
#ifdef RENDER
PicturePtr pPicture; PicturePtr pPicture;
RegionPtr pRegion; RegionPtr pRegion;
ScreenPtr pScreen; ScreenPtr pScreen;
@ -785,9 +778,6 @@ ProcXFixesSetPictureClipRegion (ClientPtr client)
return SetPictureClipRegion (pPicture, stuff->xOrigin, stuff->yOrigin, return SetPictureClipRegion (pPicture, stuff->xOrigin, stuff->yOrigin,
pRegion); pRegion);
#else
return BadRequest;
#endif
} }
int int