xserver: Branch 'glucose-2' - 3 commits

[Alan Hourihane]

 GL/glx/glxext.c     |    2 +-
 GL/glx/glxscreens.c |    9 +++++----
 glucose/glucose.c   |   21 ---------------------
 3 files changed, 6 insertions(+), 26 deletions(-)

New commits:
commit f3f75eb06e65bc92ea613c357dbb8f06b07ec67b
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 5d144873bec2fa3a0021ab42d0c7a25dad9357ff
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 a03a652840030895069a1c0ff973f3f7b13f6b7d
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 e3fe990..1b9b3f0 100644
--- a/glucose/glucose.c
+++ b/glucose/glucose.c
@@ -124,14 +124,6 @@ glucoseCreateScreenResources(ScreenPtr pScreen)
 
     __pGlxClient = serverClient;
     
-    /* 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) {
@@ -726,19 +718,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;