diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-02 09:00:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-02 09:00:24 +0000 |
| commit | 240baf59a219841c5f8942c82f7ed61da9d2323b (patch) | |
| tree | 76937e127002c1ba58c5a379651f20a17e866627 /xorg-server/hw/xquartz/GL/indirect.c | |
| parent | 6c5a4ae0c8e57225ce31fb0a39c87ec9a5eed2b5 (diff) | |
| parent | d2758df0a0091496717fe7a65c3e7563e7c82785 (diff) | |
| download | vcxsrv-240baf59a219841c5f8942c82f7ed61da9d2323b.tar.gz vcxsrv-240baf59a219841c5f8942c82f7ed61da9d2323b.tar.bz2 vcxsrv-240baf59a219841c5f8942c82f7ed61da9d2323b.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/GL/indirect.c')
| -rw-r--r-- | xorg-server/hw/xquartz/GL/indirect.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c index b432ec750..718727ebe 100644 --- a/xorg-server/hw/xquartz/GL/indirect.c +++ b/xorg-server/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;
|