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

remove PIXPRIV checks as this flag is always set.

This commit is contained in:
Eamon Walsh 2007-03-06 15:32:13 -05:00 committed by Eamon Walsh
parent 024bbc7cbb
commit a7cd53deb9
17 changed files with 0 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Xext/shm.c
View File

@ -119,9 +119,7 @@ static int pixmapFormat;
static int shmPixFormat[MAXSCREENS]; static int shmPixFormat[MAXSCREENS];
static ShmFuncsPtr shmFuncs[MAXSCREENS]; static ShmFuncsPtr shmFuncs[MAXSCREENS];
static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS]; static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
#ifdef PIXPRIV
static int shmPixmapPrivate; static int shmPixmapPrivate;
#endif
static ShmFuncs miFuncs = {NULL, miShmPutImage}; static ShmFuncs miFuncs = {NULL, miShmPutImage};
static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage}; static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
@ -237,7 +235,6 @@ ShmExtensionInit(INITARGS)
destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap; destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap;
screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap; screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;
} }
#ifdef PIXPRIV
shmPixmapPrivate = AllocatePixmapPrivateIndex(); shmPixmapPrivate = AllocatePixmapPrivateIndex();
for (i = 0; i < screenInfo.numScreens; i++) for (i = 0; i < screenInfo.numScreens; i++)
{ {
@ -245,7 +242,6 @@ ShmExtensionInit(INITARGS)
shmPixmapPrivate, 0)) shmPixmapPrivate, 0))
return; return;
} }
#endif
} }
} }
ShmSegType = CreateNewResourceType(ShmDetachSegment); ShmSegType = CreateNewResourceType(ShmDetachSegment);
@ -299,22 +295,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
if (pPixmap->refcnt == 1) if (pPixmap->refcnt == 1)
{ {
ShmDescPtr shmdesc; ShmDescPtr shmdesc;
#ifdef PIXPRIV
shmdesc = (ShmDescPtr) pPixmap->devPrivates[shmPixmapPrivate].ptr; shmdesc = (ShmDescPtr) pPixmap->devPrivates[shmPixmapPrivate].ptr;
#else
char *base = (char *) pPixmap->devPrivate.ptr;
if (base != (pointer) (pPixmap + 1))
{
for (shmdesc = Shmsegs; shmdesc; shmdesc = shmdesc->next)
{
if (shmdesc->addr <= base && base <= shmdesc->addr + shmdesc->size)
break;
}
}
else
shmdesc = 0;
#endif
if (shmdesc) if (shmdesc)
ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id); ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id);
} }
@ -781,9 +762,7 @@ CreatePmap:
shmdesc->addr + stuff->offset); shmdesc->addr + stuff->offset);
if (pMap) { if (pMap) {
#ifdef PIXPRIV
pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc; pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
#endif
shmdesc->refcnt++; shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = newPix->info[j].id; pMap->drawable.id = newPix->info[j].id;
@ -1097,9 +1076,7 @@ CreatePmap:
shmdesc->addr + stuff->offset); shmdesc->addr + stuff->offset);
if (pMap) if (pMap)
{ {
#ifdef PIXPRIV
pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc; pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
#endif
shmdesc->refcnt++; shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = stuff->pid; pMap->drawable.id = stuff->pid;

4
afb/afbpixmap.c
View File

@ -102,12 +102,8 @@ afbCreatePixmap(pScreen, width, height, depth)
pPixmap->drawable.height = height; pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth; pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1; pPixmap->refcnt = 1;
#ifdef PIXPRIV
pPixmap->devPrivate.ptr = datasize ? pPixmap->devPrivate.ptr = datasize ?
(pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL; (pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL;
#else
pPixmap->devPrivate.ptr = (pointer)(pPixmap + 1);
#endif
return(pPixmap); return(pPixmap);
} }

4
cfb/cfbpixmap.c
View File

@ -96,12 +96,8 @@ cfbCreatePixmap (pScreen, width, height, depth)
pPixmap->drawable.height = height; pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth; pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1; pPixmap->refcnt = 1;
#ifdef PIXPRIV
pPixmap->devPrivate.ptr = datasize ? pPixmap->devPrivate.ptr = datasize ?
(pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL; (pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL;
#else
pPixmap->devPrivate.ptr = (pointer)(pPixmap + 1);
#endif
return pPixmap; return pPixmap;
} }

6
dix/main.c
View File

@ -361,9 +361,7 @@ main(int argc, char *argv[], char *envp[])
ResetScreenPrivates(); ResetScreenPrivates();
ResetWindowPrivates(); ResetWindowPrivates();
ResetGCPrivates(); ResetGCPrivates();
#ifdef PIXPRIV
ResetPixmapPrivates(); ResetPixmapPrivates();
#endif
ResetColormapPrivates(); ResetColormapPrivates();
ResetFontPrivateIndex(); ResetFontPrivateIndex();
ResetDevicePrivateIndex(); ResetDevicePrivateIndex();
@ -731,11 +729,9 @@ AddScreen(
pScreen->GCPrivateSizes = (unsigned *)NULL; pScreen->GCPrivateSizes = (unsigned *)NULL;
pScreen->totalGCSize = pScreen->totalGCSize =
((sizeof(GC) + sizeof(long) - 1) / sizeof(long)) * sizeof(long); ((sizeof(GC) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
#ifdef PIXPRIV
pScreen->PixmapPrivateLen = 0; pScreen->PixmapPrivateLen = 0;
pScreen->PixmapPrivateSizes = (unsigned *)NULL; pScreen->PixmapPrivateSizes = (unsigned *)NULL;
pScreen->totalPixmapSize = BitmapBytePad(sizeof(PixmapRec)*8); pScreen->totalPixmapSize = BitmapBytePad(sizeof(PixmapRec)*8);
#endif
pScreen->ClipNotify = 0; /* for R4 ddx compatibility */ pScreen->ClipNotify = 0; /* for R4 ddx compatibility */
pScreen->CreateScreenResources = 0; pScreen->CreateScreenResources = 0;
@ -799,9 +795,7 @@ FreeScreen(ScreenPtr pScreen)
{ {
xfree(pScreen->WindowPrivateSizes); xfree(pScreen->WindowPrivateSizes);
xfree(pScreen->GCPrivateSizes); xfree(pScreen->GCPrivateSizes);
#ifdef PIXPRIV
xfree(pScreen->PixmapPrivateSizes); xfree(pScreen->PixmapPrivateSizes);
#endif
xfree(pScreen->devPrivates); xfree(pScreen->devPrivates);
xfree(pScreen); xfree(pScreen);
} }

2
dix/privates.c
View File

@ -309,7 +309,6 @@ AllocateGCPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
/* /*
* pixmap private machinery * pixmap private machinery
*/ */
#ifdef PIXPRIV
static int pixmapPrivateCount; static int pixmapPrivateCount;
void void
@ -355,7 +354,6 @@ AllocatePixmapPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
pScreen->totalPixmapSize = BitmapBytePad(pScreen->totalPixmapSize * 8); pScreen->totalPixmapSize = BitmapBytePad(pScreen->totalPixmapSize * 8);
return TRUE; return TRUE;
} }
#endif
/* /*

4
fb/fbpixmap.c
View File

@ -43,11 +43,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
if (paddedWidth / 4 > 32767 || height > 32767) if (paddedWidth / 4 > 32767 || height > 32767)
return NullPixmap; return NullPixmap;
datasize = height * paddedWidth; datasize = height * paddedWidth;
#ifdef PIXPRIV
base = pScreen->totalPixmapSize; base = pScreen->totalPixmapSize;
#else
base = sizeof (PixmapRec);
#endif
adjust = 0; adjust = 0;
if (base & 7) if (base & 7)
adjust = 8 - (base & 7); adjust = 8 - (base & 7);

4
hw/dmx/dmxpixmap.c
View File

@ -49,15 +49,11 @@
/** Initialize a private area in \a pScreen for pixmap information. */ /** Initialize a private area in \a pScreen for pixmap information. */
Bool dmxInitPixmap(ScreenPtr pScreen) Bool dmxInitPixmap(ScreenPtr pScreen)
{ {
#ifdef PIXPRIV
if (!AllocatePixmapPrivate(pScreen, dmxPixPrivateIndex, if (!AllocatePixmapPrivate(pScreen, dmxPixPrivateIndex,
sizeof(dmxPixPrivRec))) sizeof(dmxPixPrivRec)))
return FALSE; return FALSE;
return TRUE; return TRUE;
#else
#error Must define PIXPRIV to compile DMX X server
#endif
} }
/** Create a pixmap on the back-end server. */ /** Create a pixmap on the back-end server. */

6
hw/dmx/dmxscrinit.c
View File

@ -70,9 +70,7 @@ static unsigned long *dmxCursorGeneration;
int dmxGCPrivateIndex; /**< Private index for GCs */ int dmxGCPrivateIndex; /**< Private index for GCs */
int dmxWinPrivateIndex; /**< Private index for Windows */ int dmxWinPrivateIndex; /**< Private index for Windows */
#ifdef PIXPRIV
int dmxPixPrivateIndex; /**< Private index for Pixmaps */ int dmxPixPrivateIndex; /**< Private index for Pixmaps */
#endif
int dmxFontPrivateIndex; /**< Private index for Fonts */ int dmxFontPrivateIndex; /**< Private index for Fonts */
int dmxScreenPrivateIndex; /**< Private index for Screens */ int dmxScreenPrivateIndex; /**< Private index for Screens */
int dmxColormapPrivateIndex; /**< Private index for Colormaps */ int dmxColormapPrivateIndex; /**< Private index for Colormaps */
@ -233,14 +231,10 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
if (dmxWinPrivateIndex == -1) if (dmxWinPrivateIndex == -1)
return FALSE; return FALSE;
#ifdef PIXPRIV
/* Allocate pixmap private index */ /* Allocate pixmap private index */
dmxPixPrivateIndex = AllocatePixmapPrivateIndex(); dmxPixPrivateIndex = AllocatePixmapPrivateIndex();
if (dmxPixPrivateIndex == -1) if (dmxPixPrivateIndex == -1)
return FALSE; return FALSE;
#else
#error Must define PIXPRIV to compile DMX X server
#endif
/* Allocate font private index */ /* Allocate font private index */
dmxFontPrivateIndex = AllocateFontPrivateIndex(); dmxFontPrivateIndex = AllocateFontPrivateIndex();

2
hw/xfree86/loader/dixsym.c
View File

@ -271,10 +271,8 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(AllocateColormapPrivateIndex) SYMFUNC(AllocateColormapPrivateIndex)
SYMFUNC(AllocateDevicePrivateIndex) SYMFUNC(AllocateDevicePrivateIndex)
SYMFUNC(AllocateDevicePrivate) SYMFUNC(AllocateDevicePrivate)
#ifdef PIXPRIV
SYMFUNC(AllocatePixmapPrivateIndex) SYMFUNC(AllocatePixmapPrivateIndex)
SYMFUNC(AllocatePixmapPrivate) SYMFUNC(AllocatePixmapPrivate)
#endif
/* resource.c */ /* resource.c */
SYMFUNC(AddResource) SYMFUNC(AddResource)
SYMFUNC(ChangeResourceValue) SYMFUNC(ChangeResourceValue)

4
hw/xfree86/xf4bpp/ppcPixmap.c
View File

@ -120,12 +120,8 @@ xf4bppCreatePixmap( pScreen, width, height, depth )
pPixmap->devKind = size; pPixmap->devKind = size;
pPixmap->refcnt = 1 ; pPixmap->refcnt = 1 ;
size = height * pPixmap->devKind ; size = height * pPixmap->devKind ;
#ifdef PIXPRIV
pPixmap->devPrivate.ptr = (pointer) (((CARD8*)pPixmap) pPixmap->devPrivate.ptr = (pointer) (((CARD8*)pPixmap)
+ pScreen->totalPixmapSize); + pScreen->totalPixmapSize);
#else
pPixmap->devPrivate.ptr = (pointer) (pPixmap + 1);
#endif
bzero( (char *) pPixmap->devPrivate.ptr, size ) ; bzero( (char *) pPixmap->devPrivate.ptr, size ) ;
return pPixmap ; return pPixmap ;
} }

6
hw/xnest/Pixmap.c
View File

@ -32,9 +32,7 @@ is" without express or implied warranty.
#include "Screen.h" #include "Screen.h"
#include "XNPixmap.h" #include "XNPixmap.h"
#ifdef PIXPRIV
int xnestPixmapPrivateIndex; int xnestPixmapPrivateIndex;
#endif
PixmapPtr PixmapPtr
xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth) xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
@ -57,12 +55,8 @@ xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pPixmap->refcnt = 1; pPixmap->refcnt = 1;
pPixmap->devKind = PixmapBytePad(width, depth); pPixmap->devKind = PixmapBytePad(width, depth);
#ifdef PIXPRIV
pPixmap->devPrivates[xnestPixmapPrivateIndex].ptr = pPixmap->devPrivates[xnestPixmapPrivateIndex].ptr =
(pointer)((char *)pPixmap + pScreen->totalPixmapSize); (pointer)((char *)pPixmap + pScreen->totalPixmapSize);
#else
pPixmap->devPrivate.ptr = (pointer)(pPixmap + 1);
#endif
if (width && height) if (width && height)
xnestPixmapPriv(pPixmap)->pixmap = xnestPixmapPriv(pPixmap)->pixmap =
XCreatePixmap(xnestDisplay, XCreatePixmap(xnestDisplay,

4
hw/xnest/Screen.c
View File

@ -49,9 +49,7 @@ Window xnestScreenSaverWindows[MAXSCREENS];
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
#endif #endif
#ifdef PIXPRIV
int xnestScreenGeneration = -1; int xnestScreenGeneration = -1;
#endif
ScreenPtr ScreenPtr
xnestScreen(Window window) xnestScreen(Window window)
@ -154,7 +152,6 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
sizeof(xnestPrivGC)))) sizeof(xnestPrivGC))))
return False; return False;
#ifdef PIXPRIV
if (xnestScreenGeneration != serverGeneration) { if (xnestScreenGeneration != serverGeneration) {
if ((xnestPixmapPrivateIndex = AllocatePixmapPrivateIndex()) < 0) if ((xnestPixmapPrivateIndex = AllocatePixmapPrivateIndex()) < 0)
return False; return False;
@ -164,7 +161,6 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
if (!AllocatePixmapPrivate(pScreen,xnestPixmapPrivateIndex, if (!AllocatePixmapPrivate(pScreen,xnestPixmapPrivateIndex,
sizeof (xnestPrivPixmap))) sizeof (xnestPrivPixmap)))
return False; return False;
#endif
visuals = (VisualPtr)xalloc(xnestNumVisuals * sizeof(VisualRec)); visuals = (VisualPtr)xalloc(xnestNumVisuals * sizeof(VisualRec));
numVisuals = 0; numVisuals = 0;

7
hw/xnest/XNPixmap.h
View File

@ -15,21 +15,14 @@ is" without express or implied warranty.
#ifndef XNESTPIXMAP_H #ifndef XNESTPIXMAP_H
#define XNESTPIXMAP_H #define XNESTPIXMAP_H
#ifdef PIXPRIV
extern int xnestPixmapPrivateIndex; extern int xnestPixmapPrivateIndex;
#endif
typedef struct { typedef struct {
Pixmap pixmap; Pixmap pixmap;
} xnestPrivPixmap; } xnestPrivPixmap;
#ifdef PIXPRIV
#define xnestPixmapPriv(pPixmap) \ #define xnestPixmapPriv(pPixmap) \
((xnestPrivPixmap *)((pPixmap)->devPrivates[xnestPixmapPrivateIndex].ptr)) ((xnestPrivPixmap *)((pPixmap)->devPrivates[xnestPixmapPrivateIndex].ptr))
#else
#define xnestPixmapPriv(pPixmap) \
((xnestPrivPixmap *)((pPixmap)->devPrivate.ptr))
#endif
#define xnestPixmap(pPixmap) (xnestPixmapPriv(pPixmap)->pixmap) #define xnestPixmap(pPixmap) (xnestPixmapPriv(pPixmap)->pixmap)

2
include/pixmapstr.h
View File

@ -86,9 +86,7 @@ typedef struct _Pixmap {
int refcnt; int refcnt;
int devKind; int devKind;
DevUnion devPrivate; DevUnion devPrivate;
#ifdef PIXPRIV
DevUnion *devPrivates; /* real devPrivates like gcs & windows */ DevUnion *devPrivates; /* real devPrivates like gcs & windows */
#endif
#ifdef COMPOSITE #ifdef COMPOSITE
short screen_x; short screen_x;
short screen_y; short screen_y;

4
include/screenint.h
View File

@ -86,8 +86,6 @@ extern int AddScreen(
int /*argc*/, int /*argc*/,
char** /*argv*/); char** /*argv*/);
#ifdef PIXPRIV
extern void ResetPixmapPrivates(void); extern void ResetPixmapPrivates(void);
extern int AllocatePixmapPrivateIndex(void); extern int AllocatePixmapPrivateIndex(void);
@ -97,8 +95,6 @@ extern Bool AllocatePixmapPrivate(
int /* index */, int /* index */,
unsigned /* amount */); unsigned /* amount */);
#endif /* PIXPRIV */
extern void ResetColormapPrivates(void); extern void ResetColormapPrivates(void);

2
include/scrnintstr.h
View File

@ -558,11 +558,9 @@ typedef struct _Screen {
PixmapPtr pScratchPixmap; /* scratch pixmap "pool" */ PixmapPtr pScratchPixmap; /* scratch pixmap "pool" */
#ifdef PIXPRIV
int PixmapPrivateLen; int PixmapPrivateLen;
unsigned int *PixmapPrivateSizes; unsigned int *PixmapPrivateSizes;
unsigned int totalPixmapSize; unsigned int totalPixmapSize;
#endif
MarkWindowProcPtr MarkWindow; MarkWindowProcPtr MarkWindow;
MarkOverlappedWindowsProcPtr MarkOverlappedWindows; MarkOverlappedWindowsProcPtr MarkOverlappedWindows;

4
mfb/mfbpixmap.c
View File

@ -101,12 +101,8 @@ mfbCreatePixmap (pScreen, width, height, depth)
pPixmap->drawable.height = height; pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth; pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1; pPixmap->refcnt = 1;
#ifdef PIXPRIV
pPixmap->devPrivate.ptr = datasize ? pPixmap->devPrivate.ptr = datasize ?
(pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL; (pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL;
#else
pPixmap->devPrivate.ptr = (pointer)(pPixmap + 1);
#endif
return pPixmap; return pPixmap;
} }