xserver: Branch 'glucose-2' - 2 commits

[Alan Hourihane]

 hw/xgl/glxext/xglglxext.c |    8 ++++----
 xgl/xglsync.c             |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit b534a4d8b88e509c1748eb871803bcb5fa85a8de
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Fri Oct 19 12:04:51 2007 +0100

    update Xgl

diff --git a/hw/xgl/glxext/xglglxext.c b/hw/xgl/glxext/xglglxext.c
index e84a416..c47abde 100644
--- a/hw/xgl/glxext/xglglxext.c
+++ b/hw/xgl/glxext/xglglxext.c
@@ -6343,12 +6343,12 @@ xglScreenProbe (ScreenPtr pScreen)
 	}
     }
 
-    screen->base.modes		  = screen->mesaScreen->modes;
-    screen->base.pVisualPriv	  = screen->mesaScreen->pVisualPriv;
+    screen->base.fbconfigs	  = screen->mesaScreen->fbconfigs;
+    screen->base.numFBConfigs	  = screen->mesaScreen->numFBConfigs;
     screen->base.numVisuals	  = screen->mesaScreen->numVisuals;
-    screen->base.numUsableVisuals = screen->mesaScreen->numUsableVisuals;
+    screen->base.visuals          = screen->mesaScreen->visuals;
 
-    modes = screen->base.modes;
+    modes = screen->base.fbconfigs;
 
     /* Create Xgl GLX visuals */
     for (i = 0; i < pScreen->numVisuals; i++)
commit 8e4190627e50a0a4d641de07e114a5362dec137b
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Fri Oct 19 12:00:17 2007 +0100

    Missed a rename

diff --git a/xgl/xglsync.c b/xgl/xglsync.c
index b951be4..94417a0 100644
--- a/xgl/xglsync.c
+++ b/xgl/xglsync.c
@@ -478,10 +478,10 @@ xglAddCurrentBitDamage (DrawablePtr pDrawable)
     {
     	/* This is a little severe as it also impacts xgl - tune me */
     	XGL_SCREEN_PRIV (pDrawable->pScreen);
-	__glXleaveServer(FALSE);
+	xglLeaveServer();
 	glitz_surface_flush (pScreenPriv->surface);
 	glitz_drawable_finish (pScreenPriv->drawable);
-	__glXenterServer(FALSE);
+	xglEnterServer();
     }
 
     if (REGION_NOTEMPTY (pDrawable->pScreen, &pPixmapPriv->bitRegion))