xserver: Branch 'glucose-2' - 2 commits

[Jose Fonseca]

 glucose/glucose.c          |    4 ++++
 glucose/glucose_context.c  |    1 +
 glucose/glucose_drawable.c |    1 +
 3 files changed, 6 insertions(+)

New commits:
diff-tree 051d68415635282a246ec7e5f5d6b0f9c4de71aa (from dd474d95d094ae4494708a87d968a933337241fa)
Author: José Fonseca <jfonseca at titan.(none)>
Date:   Wed Sep 26 14:18:06 2007 +0000

    Fix undeclared function call warnings.

diff --git a/glucose/glucose_context.c b/glucose/glucose_context.c
index 7e6c71b..1f6c452 100644
--- a/glucose/glucose_context.c
+++ b/glucose/glucose_context.c
@@ -33,6 +33,7 @@
 #endif
 
 #include "glxserver.h"
+#include "glxutil.h"
 #include "glcontextmodes.h"
 #include "glitz.h"
 #include "glitz_glucose.h"
diff --git a/glucose/glucose_drawable.c b/glucose/glucose_drawable.c
index c35dfa9..01194c4 100644
--- a/glucose/glucose_drawable.c
+++ b/glucose/glucose_drawable.c
@@ -33,6 +33,7 @@
 #endif
 
 #include "glxserver.h"
+#include "glxutil.h"
 #include "glitz_glucose.h"
 
 extern __GLXcontext *__glXLastContext;
diff-tree dd474d95d094ae4494708a87d968a933337241fa (from 25363e5b83ab8a63150a0b6ca5e98c9e36760beb)
Author: José Fonseca <jfonseca at titan.(none)>
Date:   Wed Sep 26 14:17:34 2007 +0000

    Point __pGlxClient to serverClient when creating/destroying the root drawable.

diff --git a/glucose/glucose.c b/glucose/glucose.c
index 076bb7e..e3fe990 100644
--- a/glucose/glucose.c
+++ b/glucose/glucose.c
@@ -122,6 +122,8 @@ glucoseCreateScreenResources(ScreenPtr p
     PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen);
     xglScreenPtr xglScreenPriv = XGL_GET_SCREEN_PRIV (pScreen);
 
+    __pGlxClient = serverClient;
+    
     /* track root pixmap */
     if (pPixmap)
     {
@@ -750,6 +752,8 @@ glucoseCloseScreen (int	  index,
     {
     	GlucoseScreenPrivPtr pScreenPriv = GlucoseGetScreenPriv(pScreen);
 
+        __pGlxClient = serverClient;        
+
     	pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
     	pScreenPriv->rootDrawable->destroy(pScreenPriv->rootDrawable);