frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 f0006aa58f
The root cause of this change was  fed7ccc481ad1caaa518cafe944c2327a5d0b6c65

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2010-07-28 18:08:02 -07:00
parent 9c171d4aee
commit 98f90145d7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xquartz/GL/indirect.c
View File

@ -271,8 +271,7 @@ static void __glXAquaContextDestroy(__GLXcontext *baseContext) {
__GLXAquaContext *context = (__GLXAquaContext *) baseContext; __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx 0x%x)\n", GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx %p)\n", baseContext);
(unsigned int) baseContext);
if (context != NULL) { if (context != NULL) {
if (context->sid != 0 && surface_hash != NULL) { if (context->sid != 0 && surface_hash != NULL) {
lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), 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: case AppleDRISurfaceNotifyDestroyed:
if (surface_hash != NULL) if (surface_hash != NULL)
x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id)); x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));
draw->base.pDraw = NULL; draw->pDraw = NULL;
draw->sid = 0; draw->sid = 0;
break; break;