[Xquartz-changes] xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/GL/indirect.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 98f90145d786695ecbc02a667c6ffe7c619dc67e
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Jul 28 18:08:02 2010 -0700

    XQuartz: GLX: Don't mangle __GLXDrawable's pDraw
    
    We were incorrectly NULLing out pDraw in __GLXDrawable instead of ours in
    __GLXAquaDrawable. (we should refactor to eliminate this redundancy later)
    
    This was causing http://xquartz.macosforge.org/trac/ticket/426
    This was benign until commit f0006aa58f6cf7552a239e169ff6e7e4fda532f4
    The root cause of this change was  fed7ccc481ad1caaa518cafe944c2327a5d0b6c65
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 3e8d730..58f78fb 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -271,8 +271,7 @@ static void __glXAquaContextDestroy(__GLXcontext *baseContext) {
 
     __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
     
-    GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx 0x%x)\n",
-                     (unsigned int) baseContext);
+    GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx %p)\n", baseContext);
     if (context != NULL) {
       if (context->sid != 0 && surface_hash != NULL) {
 		lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);
@@ -321,7 +320,7 @@ static void surface_notify(void *_arg, void *data) {
     case AppleDRISurfaceNotifyDestroyed:
         if (surface_hash != NULL)
             x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));
-	draw->base.pDraw = NULL;
+	draw->pDraw = NULL;
 	draw->sid = 0;
         break;