xserver: Branch 'glucose-2'

[Alan Hourihane]

 glucose/glucose_drawable.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bede10747a351ef8a64bc95f3152cc1cb58317e1
Author: Alan Hourihane <alanh at localhost.(none)>
Date:   Wed Aug 20 10:45:20 2008 +0100

    Set the GLX screen on context creation

diff --git a/glucose/glucose_drawable.c b/glucose/glucose_drawable.c
index 01194c4..a6eaf0a 100644
--- a/glucose/glucose_drawable.c
+++ b/glucose/glucose_drawable.c
@@ -117,6 +117,8 @@ glitz_glucose_create_drawable_for_window (__GLXscreen        *screen,
     if (!context)
 	return NULL;
 
+    context->context->pGlxScreen = screen;
+
     drawable = _glitz_glucose_create_drawable (screen_info, context, format,
 					   window, 
 					   width, height);
@@ -146,8 +148,8 @@ glitz_glucose_destroy (void *abstract_drawable)
 	glitz_glucose_pop_current (abstract_drawable);
     }
 
-    if (__glXLastContext->drawPriv == drawable->drawable) {
-        __glXDeassociateContext(drawable->context->context);
+    if (__glXLastContext &&
+        __glXLastContext->drawPriv == drawable->drawable) {
 	__glXLastContext = NULL;
     }