summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11/fakeglx.c
diff options
context:
space:
mode:
authorThierry Reding <[email protected]>2006-11-18 17:59:25 +0000
committerThierry Reding <[email protected]>2006-11-18 17:59:25 +0000
commitbb44a8ae1f392d44b2f588c831101c865485bcfd (patch)
tree3c5e6aa649975c46d68c3f7745f6410ddac1f174 /src/mesa/drivers/x11/fakeglx.c
parentb5a5062176ffae31566f55db4eee6099d15ccf1f (diff)
Update to latest upstream release candidate.
Update patches.
Diffstat (limited to 'src/mesa/drivers/x11/fakeglx.c')
-rw-r--r--src/mesa/drivers/x11/fakeglx.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index bc779a94a9e..eecd52aa32b 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.5.1
+ * Version: 6.5.2
*
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
@@ -1388,7 +1388,7 @@ Fake_glXCreateContext( Display *dpy, XVisualInfo *visinfo,
xmvis = create_glx_visual( dpy, visinfo );
if (!xmvis) {
/* unusable visual */
- FREE(glxCtx);
+ _mesa_free(glxCtx);
return NULL;
}
}
@@ -1396,7 +1396,7 @@ Fake_glXCreateContext( Display *dpy, XVisualInfo *visinfo,
glxCtx->xmesaContext = XMesaCreateContext(xmvis,
shareCtx ? shareCtx->xmesaContext : NULL);
if (!glxCtx->xmesaContext) {
- FREE(glxCtx);
+ _mesa_free(glxCtx);
return NULL;
}
@@ -1617,6 +1617,7 @@ Fake_glXDestroyContext( Display *dpy, GLXContext ctx )
MakeCurrent_PrevReadBuffer = 0;
XMesaDestroyContext( glxCtx->xmesaContext );
XMesaGarbageCollect();
+ _mesa_free(glxCtx);
}
@@ -2277,7 +2278,7 @@ Fake_glXCreateNewContext( Display *dpy, GLXFBConfig config,
glxCtx->xmesaContext = XMesaCreateContext(xmvis,
shareCtx ? shareCtx->xmesaContext : NULL);
if (!glxCtx->xmesaContext) {
- FREE(glxCtx);
+ _mesa_free(glxCtx);
return NULL;
}
@@ -2500,7 +2501,7 @@ Fake_glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int re
glxCtx->xmesaContext = XMesaCreateContext(xmvis,
shareCtx ? shareCtx->xmesaContext : NULL);
if (!glxCtx->xmesaContext) {
- FREE(glxCtx);
+ _mesa_free(glxCtx);
return NULL;
}