xserver: Branch 'glucose-server-1.4' - 5 commits
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Oct 18 03:32:02 PDT 2007
GL/glx/glxext.c | 2
GL/glx/glxscreens.c | 9 +--
glucose/glucose.c | 135 +++++++++++++++++++++++++++++++++-------------------
glucose/glucose.h | 4 +
hw/xgl/xglglx.c | 4 -
xgl/xgl.h | 5 +
xgl/xglcompose.c | 4 -
xgl/xglcopy.c | 4 -
xgl/xglget.c | 4 -
xgl/xglpixmap.c | 8 +--
xgl/xglsolid.c | 4 -
xgl/xglsync.c | 8 +--
xgl/xgltile.c | 8 +--
13 files changed, 123 insertions(+), 76 deletions(-)
New commits:
commit fac1e36f09e057dcc9bffaba6d649254b5cd03a0
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date: Tue Oct 16 16:25:23 2007 +0100
Hook on CreateWindow instead of CreateScreenResources.
diff --git a/glucose/glucose.c b/glucose/glucose.c
index 5fdf035..e1e5219 100644
--- a/glucose/glucose.c
+++ b/glucose/glucose.c
@@ -57,7 +57,7 @@ int xglGlyphPrivateIndex;
static int glucoseGeneration = -1;
int glucoseScreenPrivateIndex;
-int glucoseCreateScreenResourcesIndex;
+int glucoseCreateWindowIndex;
xglScreenInfoRec xglScreenInfo = {
NULL, 0, 0, 0, 0, 0,
@@ -79,33 +79,40 @@ xglScreenInfoRec xglScreenInfo = {
static glitz_drawable_format_t *
glucoseInitOutput(__GLXscreen *screen);
+/* Wrapped for glxext close down */
+static void glucoseDestroyGLXscreen(__GLXscreen *screen)
+{
+ ErrorF("SHUTDOWN EXTENSION\n");
+}
+
static Bool
-glucoseCreateScreenResources(ScreenPtr pScreen)
+glucoseCreateWindow(WindowPtr pWin)
{
int ret = TRUE;
- CreateScreenResourcesProcPtr CreateScreenResources =
- (CreateScreenResourcesProcPtr)(pScreen->devPrivates[glucoseCreateScreenResourcesIndex].ptr);
+ ScreenPtr pScreen = pWin->drawable.pScreen;
+ CreateWindowProcPtr CreateWindow =
+ (CreateWindowProcPtr)(pScreen->devPrivates[glucoseCreateWindowIndex].ptr);
GlucoseScreenPrivPtr pScreenPriv = GlucoseGetScreenPriv(pScreen);
int err;
xf86DrvMsg(pScreen->myNum, X_INFO,
"Glucose initializing screen %d\n",pScreen->myNum);
- if ( pScreen->CreateScreenResources != glucoseCreateScreenResources ) {
+ if ( pScreen->CreateWindow != glucoseCreateWindow ) {
/* Can't find hook we are hung on */
xf86DrvMsg(pScreen->myNum, X_WARNING /* X_ERROR */,
- "glucoseCreateScreenResources %p called when not in pScreen->CreateScreenResources %p n",
- (void *)glucoseCreateScreenResources,
- (void *)pScreen->CreateScreenResources );
+ "glucoseCreateWindow %p called when not in pScreen->CreateWindow %p n",
+ (void *)glucoseCreateWindow,
+ (void *)pScreen->CreateWindow );
}
/* Unhook this function ... */
- pScreen->CreateScreenResources = CreateScreenResources;
- pScreen->devPrivates[glucoseCreateScreenResourcesIndex].ptr = NULL;
+ pScreen->CreateWindow = CreateWindow;
+ pScreen->devPrivates[glucoseCreateWindowIndex].ptr = NULL;
- /* ... and call the previous CreateScreenResources fuction, if any */
- if (NULL!=pScreen->CreateScreenResources) {
- ret = (*pScreen->CreateScreenResources)(pScreen);
+ /* ... and call the previous CreateWindow fuction, if any */
+ if (NULL!=pScreen->CreateWindow) {
+ ret = (*pScreen->CreateWindow)(pWin);
}
xglScreenInfo.width = pScreen->width;
@@ -115,6 +122,9 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
pScreenPriv->screen = __glXActiveScreens[pScreen->myNum];
+ pScreenPriv->destroyGLXscreen = pScreenPriv->screen->destroy;
+ pScreenPriv->screen->destroy = glucoseDestroyGLXscreen;
+
{
glitz_drawable_t *drawable;
glitz_drawable_format_t *format;
@@ -124,6 +134,14 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
xglLeaveServer();
+ /* track root pixmap */
+ if (pPixmap)
+ {
+ pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+ pPixmap->drawable.id = FakeClientID(0);
+ AddResource(pPixmap->drawable.id, RT_PIXMAP, (pointer)pPixmap);
+ }
+
pScreenPriv->rootDrawable = pScreenPriv->screen->createDrawable(pScreenPriv->screen, (DrawablePtr)pPixmap, pPixmap->drawable.id, modes);
if (!pScreenPriv->rootDrawable) {
@@ -163,8 +181,8 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
drawable = glitz_glucose_create_drawable_for_window(pScreenPriv->screen,
format, pScreenPriv->rootDrawable,
- pPixmap->drawable.width,
- pPixmap->drawable.height);
+ pScreen->width,
+ pScreen->height);
if (!drawable) {
xglEnterServer();
@@ -206,7 +224,7 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
REGION_UNINIT (pPixmap->drawable.pScreen, &pPixmapPriv->bitRegion);
- xglPixmapSurfaceInit(pPixmap, xglScreenPriv->features, pPixmap->drawable.width, pPixmap->drawable.height);
+ xglPixmapSurfaceInit(pPixmap, xglScreenPriv->features, pScreen->width, pScreen->height);
if (pScreen->devPrivate && pPixmapPriv->pDamage) {
RegionPtr pRegion = DamageRegion (pPixmapPriv->pDamage);
@@ -243,8 +261,8 @@ glucoseAllocatePrivates(ScreenPtr pScreen)
glucoseScreenPrivateIndex = AllocateScreenPrivateIndex();
if (glucoseScreenPrivateIndex < 0)
return FALSE;
- glucoseCreateScreenResourcesIndex = AllocateScreenPrivateIndex();
- if (glucoseCreateScreenResourcesIndex < 0)
+ glucoseCreateWindowIndex = AllocateScreenPrivateIndex();
+ if (glucoseCreateWindowIndex < 0)
return FALSE;
glucoseGeneration = serverGeneration;
@@ -259,9 +277,9 @@ glucoseAllocatePrivates(ScreenPtr pScreen)
pScreen->devPrivates[glucoseScreenPrivateIndex].ptr = (pointer) pScreenPriv;
- pScreen->devPrivates[glucoseCreateScreenResourcesIndex].ptr
- = (void*)(pScreen->CreateScreenResources);
- pScreen->CreateScreenResources = glucoseCreateScreenResources;
+ pScreen->devPrivates[glucoseCreateWindowIndex].ptr
+ = (void*)(pScreen->CreateWindow);
+ pScreen->CreateWindow = glucoseCreateWindow;
return TRUE;
}
@@ -360,6 +378,21 @@ xglAllocatePrivates (ScreenPtr pScreen)
return TRUE;
}
+static Bool
+glucoseDestroyPixmap (PixmapPtr pPixmap)
+{
+ ScreenPtr pScreen = pPixmap->drawable.pScreen;
+ PixmapPtr pScreenPixmap = pScreen->GetScreenPixmap(pScreen);
+
+ if (pPixmap == pScreenPixmap) {
+ ErrorF("SHUTTING DOWN\n");
+ /* we're shutting down, we'll clean this up later */
+ return TRUE;
+ }
+
+ return xglDestroyPixmap(pPixmap);
+}
+
Bool
glucoseScreenInit (ScreenPtr pScreen, int flags)
{
@@ -405,7 +438,7 @@ glucoseScreenInit (ScreenPtr pScreen, int flags)
pScreen->CreatePixmap = xglCreatePixmap;
- pScreen->DestroyPixmap = xglDestroyPixmap;
+ pScreen->DestroyPixmap = glucoseDestroyPixmap;
#ifdef MITSHM
ShmRegisterFuncs (pScreen, &shmFuncs);
@@ -682,11 +715,9 @@ glucoseFinishScreenInit (ScreenPtr pScreen)
#endif
#if 0 /* Let the driver do this ! */
-#ifdef XV
if (!xglXvScreenInit (pScreen))
return FALSE;
#endif
-#endif
return TRUE;
}
@@ -700,14 +731,13 @@ glucoseCloseScreen (int index,
XGL_SCREEN_PRIV (pScreen);
XGL_PIXMAP_PRIV (pScreenPriv->pScreenPixmap);
XGL_SCREEN_UNWRAP (CloseScreen);
-
- {
- GlucoseScreenPrivPtr pScreenPriv = GlucoseGetScreenPriv(pScreen);
+ GlucoseScreenPrivPtr pPriv = GlucoseGetScreenPriv(pScreen);
- pScreenPriv->rootContext->makeCurrent(pScreenPriv->rootContext);
- }
-
xglLeaveServer();
+
+ xglFiniPixmap (pScreenPriv->pScreenPixmap);
+ if (pPixmapPriv->pDamage)
+ DamageDestroy (pPixmapPriv->pDamage);
#ifdef RENDER
int i;
@@ -722,9 +752,29 @@ glucoseCloseScreen (int index,
FreePicture ((pointer) pScreenPriv->trapInfo.pMask, 0);
#endif
- xglFiniPixmap (pScreenPriv->pScreenPixmap);
- if (pPixmapPriv->pDamage)
- DamageDestroy (pPixmapPriv->pDamage);
+ if (pScreenPriv->surface)
+ glitz_surface_destroy (pScreenPriv->surface);
+ pPixmapPriv->surface = NULL;
+ pScreenPriv->surface = NULL;
+
+ GEOMETRY_UNINIT (&pScreenPriv->scratchGeometry);
+
+ if (pScreenPriv->drawable)
+ glitz_drawable_destroy(pScreenPriv->drawable);
+ pPixmapPriv->drawable = NULL;
+ pScreenPriv->drawable = NULL;
+ xglScreenInfo.drawable = NULL;
+
+ /* tear down glucose now */
+#if 0
+ /* Unfortunately, this causes some problems in hardware drivers */
+ /* Debug, them and re-enable this */
+ pPriv->rootContext->destroy(pPriv->rootContext);
+#endif
+ pPriv->rootDrawable->destroy(pPriv->rootDrawable);
+
+ xfree(pPriv);
+ pPriv = NULL;
while (pScreenPriv->pVisual)
{
@@ -735,17 +785,6 @@ glucoseCloseScreen (int index,
xfree(pScreenPriv);
pScreenPriv = NULL;
- /* tear down glucose now */
- {
- GlucoseScreenPrivPtr pScreenPriv = GlucoseGetScreenPriv(pScreen);
-
- pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
- pScreenPriv->rootDrawable->destroy(pScreenPriv->rootDrawable);
-
- xfree(pScreenPriv);
- pScreenPriv = NULL;
- }
-
xglEnterServer();
return (*pScreen->CloseScreen) (index, pScreen);
diff --git a/glucose/glucose.h b/glucose/glucose.h
index ad44747..dcd35dd 100644
--- a/glucose/glucose.h
+++ b/glucose/glucose.h
@@ -40,11 +40,15 @@ glucoseFinishScreenInit (ScreenPtr pScreen);
Bool
glucoseScreenInit (ScreenPtr pScreen, int flags);
+typedef void (*destroyGLXscreenProcPtr)(__GLXscreen *screen);
+
typedef struct {
__GLXdrawable *rootDrawable;
__GLXcontext *rootContext;
CloseScreenProcPtr CloseScreen;
+ DestroyPixmapProcPtr *DestroyPixmap;
__GLXscreen *screen;
+ destroyGLXscreenProcPtr destroyGLXscreen;
} GlucoseScreenPrivRec, *GlucoseScreenPrivPtr;
extern int glucoseScreenPrivateIndex;
commit 0517b1b8f5d9782bbbdb3aa9205e846eaa9ca753
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date: Tue Oct 16 16:23:20 2007 +0100
A little tidy up.
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index ab05649..52ad501 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -354,11 +354,12 @@ void __glXInitScreens(void)
void __glXResetScreens(void)
{
- int i;
+ int i;
- for (i = 0; i < screenInfo.numScreens; i++)
- if (__glXActiveScreens[i])
- __glXActiveScreens[i]->destroy(__glXActiveScreens[i]);
+ for (i = 0; i < screenInfo.numScreens; i++) {
+ if (__glXActiveScreens[i])
+ __glXActiveScreens[i]->destroy(__glXActiveScreens[i]);
+ }
xfree(__glXActiveScreens);
xfree(__glXHyperpipeFuncs);
commit e275f86bab4de549b02f049ea717d1f2824ff3e1
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date: Tue Oct 16 16:22:33 2007 +0100
Allow FlushContext, but not yet ResetScreens for GLX & glucose.
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 096f845..ac22f7e 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -76,8 +76,8 @@ static int __glXDispatch(ClientPtr);
*/
static void ResetExtension(ExtensionEntry* extEntry)
{
-#if 0 /* glucose makes this a nuisance */
__glXFlushContextCache();
+#if 0 /* glucose makes this a nuisance */
__glXResetScreens();
#endif
}
commit 8cdb75610393442e1ebec971a44d45de11fa69f9
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date: Fri Sep 28 21:22:28 2007 +0100
Cleanup destruction - fixes Xserver exiting crash.
diff --git a/glucose/glucose.c b/glucose/glucose.c
index 8adcdf3..5fdf035 100644
--- a/glucose/glucose.c
+++ b/glucose/glucose.c
@@ -122,14 +122,6 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen);
xglScreenPtr xglScreenPriv = XGL_GET_SCREEN_PRIV (pScreen);
- /* track root pixmap */
- if (pPixmap)
- {
- pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
- pPixmap->drawable.id = FakeClientID(0);
- AddResource(pPixmap->drawable.id, RT_PIXMAP, (pointer)pPixmap);
- }
-
xglLeaveServer();
pScreenPriv->rootDrawable = pScreenPriv->screen->createDrawable(pScreenPriv->screen, (DrawablePtr)pPixmap, pPixmap->drawable.id, modes);
@@ -734,19 +726,6 @@ glucoseCloseScreen (int index,
if (pPixmapPriv->pDamage)
DamageDestroy (pPixmapPriv->pDamage);
- if (pScreenPriv->surface)
- glitz_surface_destroy (pScreenPriv->surface);
- pPixmapPriv->surface = NULL;
- pScreenPriv->surface = NULL;
-
- GEOMETRY_UNINIT (&pScreenPriv->scratchGeometry);
-
- if (pScreenPriv->drawable)
- glitz_drawable_destroy(pScreenPriv->drawable);
- pPixmapPriv->drawable = NULL;
- pScreenPriv->drawable = NULL;
- xglScreenInfo.drawable = NULL;
-
while (pScreenPriv->pVisual)
{
v = pScreenPriv->pVisual;
commit db18d10b1283d1516a17f2b286316f67af5b7821
Author: José Fonseca <jfonseca at pegasus.(none)>
Date: Mon Oct 8 18:24:21 2007 +0000
Isolate the __glX{enter,leave}Server calls.
diff --git a/glucose/glucose.c b/glucose/glucose.c
index 23c57e8..8adcdf3 100644
--- a/glucose/glucose.c
+++ b/glucose/glucose.c
@@ -122,8 +122,6 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen);
xglScreenPtr xglScreenPriv = XGL_GET_SCREEN_PRIV (pScreen);
- __pGlxClient = serverClient;
-
/* track root pixmap */
if (pPixmap)
{
@@ -132,9 +130,12 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
AddResource(pPixmap->drawable.id, RT_PIXMAP, (pointer)pPixmap);
}
+ xglLeaveServer();
+
pScreenPriv->rootDrawable = pScreenPriv->screen->createDrawable(pScreenPriv->screen, (DrawablePtr)pPixmap, pPixmap->drawable.id, modes);
if (!pScreenPriv->rootDrawable) {
+ xglEnterServer();
xf86DrvMsg(pScreen->myNum, X_WARNING,
"Glucose - creating root drawable failed\n");
return FALSE;
@@ -143,6 +144,7 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
pScreenPriv->rootContext = pScreenPriv->screen->createContext(pScreenPriv->screen, modes, NULL);
if (!pScreenPriv->rootContext) {
+ xglEnterServer();
xf86DrvMsg(pScreen->myNum, X_WARNING,
"Glucose - creating root context failed\n");
pScreenPriv->rootDrawable->destroy(pScreenPriv->rootDrawable);
@@ -153,10 +155,9 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
pScreenPriv->rootContext->drawPriv =
pScreenPriv->rootContext->readPriv = pScreenPriv->rootDrawable;
- __glXleaveServer(FALSE);
err = pScreenPriv->rootContext->makeCurrent(pScreenPriv->rootContext);
if (!err) {
- __glXenterServer(FALSE);
+ xglEnterServer();
xf86DrvMsg(pScreen->myNum, X_WARNING,
"Glucose makeCurrent failed, err is %d\n",err);
pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
@@ -174,7 +175,7 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
pPixmap->drawable.height);
if (!drawable) {
- __glXenterServer(FALSE);
+ xglEnterServer();
xf86DrvMsg(pScreen->myNum, X_ERROR,
"Glucose could not create glitz drawable, not initializing.\n");
@@ -193,7 +194,7 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
"Glucose reports GLitz features as 0x%lx\n",xglScreenPriv->features);
if (!glucoseFinishScreenInit(pScreen)) {
- __glXenterServer(FALSE);
+ xglEnterServer();
xf86DrvMsg(pScreen->myNum, X_ERROR,
"Glucose could not initialize.\n");
pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
@@ -203,7 +204,7 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
return FALSE;
}
- __glXenterServer(FALSE);
+ xglEnterServer();
/* now fixup root pixmap */
pPixmap = pScreen->GetScreenPixmap(pScreen);
@@ -714,6 +715,8 @@ glucoseCloseScreen (int index,
pScreenPriv->rootContext->makeCurrent(pScreenPriv->rootContext);
}
+ xglLeaveServer();
+
#ifdef RENDER
int i;
@@ -757,14 +760,30 @@ glucoseCloseScreen (int index,
{
GlucoseScreenPrivPtr pScreenPriv = GlucoseGetScreenPriv(pScreen);
- __pGlxClient = serverClient;
-
pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
pScreenPriv->rootDrawable->destroy(pScreenPriv->rootDrawable);
xfree(pScreenPriv);
pScreenPriv = NULL;
}
+
+ xglEnterServer();
return (*pScreen->CloseScreen) (index, pScreen);
}
+
+static ClientPtr pOldGlxClient = NULL;
+
+void xglLeaveServer(void) {
+ assert(pOldGlxClient == NULL);
+ __glXleaveServer(TRUE);
+ pOldGlxClient = __pGlxClient;
+ __pGlxClient = serverClient;
+}
+
+void xglEnterServer(void) {
+ assert(__pGlxClient == serverClient);
+ __pGlxClient = pOldGlxClient;
+ pOldGlxClient = NULL;
+ __glXenterServer(TRUE);
+}
diff --git a/hw/xgl/xglglx.c b/hw/xgl/xglglx.c
index 95ba845..189ef42 100644
--- a/hw/xgl/xglglx.c
+++ b/hw/xgl/xglglx.c
@@ -203,12 +203,12 @@ xglUnloadGLXModules (void)
}
void
-__glXenterServer(GLboolean rendering)
+xglEnterServer(void)
{
}
void
-__glXleaveServer(GLboolean rendering)
+xglLeaveServer(void)
{
}
diff --git a/xgl/xgl.h b/xgl/xgl.h
index 0fcf672..2b8f03e 100644
--- a/xgl/xgl.h
+++ b/xgl/xgl.h
@@ -1532,4 +1532,9 @@ unsigned int
xglHashFindFreeKeyBlock (xglHashTablePtr pTable,
unsigned int numKeys);
+
+void xglLeaveServer(void);
+
+void xglEnterServer(void);
+
#endif /* _XGL_H_ */
diff --git a/xgl/xglcompose.c b/xgl/xglcompose.c
index f6725ac..d0125e2 100644
--- a/xgl/xglcompose.c
+++ b/xgl/xglcompose.c
@@ -266,14 +266,14 @@ xglCompositeGeneral (CARD8 op,
else
GEOMETRY_DISABLE (dst);
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_composite (XGL_OPERATOR (op),
src, mask, dst,
xSrc, ySrc,
xMask, yMask,
xDst + dstXoff, yDst + dstYoff,
width, height);
- __glXenterServer(FALSE);
+ xglEnterServer();
glitz_surface_set_clip_region (dst, 0, 0, NULL, 0);
diff --git a/xgl/xglcopy.c b/xgl/xglcopy.c
index 00d3539..68a694f 100644
--- a/xgl/xglcopy.c
+++ b/xgl/xglcopy.c
@@ -69,7 +69,7 @@ xglCopy (DrawablePtr pSrc,
dstXoff, dstYoff,
(glitz_box_t *) pBox, nBox);
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_copy_area (src,
dst,
srcXoff + dx,
@@ -78,7 +78,7 @@ xglCopy (DrawablePtr pSrc,
pPixmap->drawable.height - dstYoff,
dstXoff,
dstYoff);
- __glXenterServer(FALSE);
+ xglEnterServer();
glitz_surface_set_clip_region (dst, 0, 0, NULL, 0);
diff --git a/xgl/xglget.c b/xgl/xglget.c
index 71e32b1..e4887f9 100644
--- a/xgl/xglget.c
+++ b/xgl/xglget.c
@@ -53,10 +53,10 @@ xglGetImage (DrawablePtr pDrawable,
if (!xglSyncSurface (&pScreenPriv->pScreenPixmap->drawable))
FatalError (XGL_SW_FAILURE_STRING);
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_surface_flush (pScreenPriv->surface);
glitz_drawable_finish (pScreenPriv->drawable);
- __glXenterServer(FALSE);
+ xglEnterServer();
}
XGL_GET_DRAWABLE (pDrawable, surface, xOff, yOff);
diff --git a/xgl/xglpixmap.c b/xgl/xglpixmap.c
index 56c7ecd..872d415 100644
--- a/xgl/xglpixmap.c
+++ b/xgl/xglpixmap.c
@@ -300,9 +300,9 @@ xglFiniPixmap (PixmapPtr pPixmap)
if (pPixmapPriv->surface) {
/* leaving because texture destruction can occur and flush primitives */
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_surface_destroy (pPixmapPriv->surface);
- __glXenterServer(FALSE);
+ xglEnterServer();
}
}
@@ -568,14 +568,14 @@ xglCreatePixmapSurface (PixmapPtr pPixmap)
if (!pPixmapPriv->pVisual || !pPixmapPriv->pVisual->format.surface)
return FALSE;
- __glXleaveServer(FALSE);
+ xglLeaveServer();
pPixmapPriv->surface =
glitz_surface_create (pScreenPriv->drawable,
pPixmapPriv->pVisual->format.surface,
pPixmap->drawable.width,
pPixmap->drawable.height,
0, NULL);
- __glXenterServer(FALSE);
+ xglEnterServer();
if (!pPixmapPriv->surface)
{
pPixmapPriv->pVisual = NULL;
diff --git a/xgl/xglsolid.c b/xgl/xglsolid.c
index a3dc281..8bb24ec 100644
--- a/xgl/xglsolid.c
+++ b/xgl/xglsolid.c
@@ -71,7 +71,7 @@ xglSolid (DrawablePtr pDrawable,
if (!GEOMETRY_ENABLE (pGeometry, surface))
return FALSE;
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_composite (op,
solid, NULL, surface,
0, 0,
@@ -79,7 +79,7 @@ xglSolid (DrawablePtr pDrawable,
x + xOff,
y + yOff,
width, height);
- __glXenterServer(FALSE);
+ xglEnterServer();
glitz_surface_set_clip_region (surface, 0, 0, NULL, 0);
diff --git a/xgl/xglsync.c b/xgl/xglsync.c
index 2daef6e..a57baf8 100644
--- a/xgl/xglsync.c
+++ b/xgl/xglsync.c
@@ -154,7 +154,7 @@ xglSyncBits (DrawablePtr pDrawable,
glitz_surface_set_clip_region (pPixmapPriv->surface,
0, 0, (glitz_box_t *) pBox, nBox);
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_get_pixels (pPixmapPriv->surface,
pExt->x1,
pExt->y1,
@@ -162,7 +162,7 @@ xglSyncBits (DrawablePtr pDrawable,
pExt->y2 - pExt->y1,
&format,
pPixmapPriv->buffer);
- __glXenterServer(FALSE);
+ xglEnterServer();
glitz_surface_set_clip_region (pPixmapPriv->surface, 0, 0, NULL, 0);
}
@@ -277,7 +277,7 @@ xglSyncSurface (DrawablePtr pDrawable)
glitz_surface_set_clip_region (pPixmapPriv->surface,
0, 0, (glitz_box_t *) pBox, nBox);
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_set_pixels (pPixmapPriv->surface,
pExt->x1,
pExt->y1,
@@ -285,7 +285,7 @@ xglSyncSurface (DrawablePtr pDrawable)
pExt->y2 - pExt->y1,
&format,
pPixmapPriv->buffer);
- __glXenterServer(FALSE);
+ xglEnterServer();
glitz_surface_set_clip_region (pPixmapPriv->surface, 0, 0, NULL, 0);
diff --git a/xgl/xgltile.c b/xgl/xgltile.c
index 200b381..6e6c4e5 100644
--- a/xgl/xgltile.c
+++ b/xgl/xgltile.c
@@ -226,7 +226,7 @@ xglTile (DrawablePtr pDrawable,
pTilePriv->pictureMask |= xglPCFillMask;
glitz_surface_set_fill (pTilePriv->surface, GLITZ_FILL_REPEAT);
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_composite (op,
pTilePriv->surface, NULL, surface,
x + tileX,
@@ -235,7 +235,7 @@ xglTile (DrawablePtr pDrawable,
x + xOff,
y + yOff,
width, height);
- __glXenterServer(FALSE);
+ xglEnterServer();
glitz_surface_set_clip_region (surface, 0, 0, NULL, 0);
@@ -260,7 +260,7 @@ xglTile (DrawablePtr pDrawable,
if (!GEOMETRY_ENABLE (pGeometry, surface))
return FALSE;
- __glXleaveServer(FALSE);
+ xglLeaveServer();
glitz_composite (op,
pTilePriv->surface, NULL, surface,
0, 0,
@@ -268,7 +268,7 @@ xglTile (DrawablePtr pDrawable,
x + xOff,
y + yOff,
width, height);
- __glXenterServer(FALSE);
+ xglEnterServer();
if (glitz_surface_get_status (surface))
return FALSE;
More information about the xorg-commit
mailing list