Mesa (master): apple: ifdef out come glapi-foo on darwin
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Mon Jun 6 00:52:44 UTC 2011
Module: Mesa
Branch: master
Commit: 8593bb32eae5368c1ba52504133b0bf200bf8e74
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8593bb32eae5368c1ba52504133b0bf200bf8e74
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Sun Jun 5 19:57:52 2011 -0400
apple: ifdef out come glapi-foo on darwin
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
src/glx/glxcurrent.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/glx/glxcurrent.c b/src/glx/glxcurrent.c
index 1f845ce..27a0ef9 100644
--- a/src/glx/glxcurrent.c
+++ b/src/glx/glxcurrent.c
@@ -216,6 +216,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
struct glx_context *oldGC = __glXGetCurrentContext();
int ret = Success;
+#ifndef GLX_USE_APPLEGL
/* XXX: If this is left out, then libGL ends up not having this
* symbol, and drivers using it fail to load. Compare the
* implementation of this symbol to _glapi_noop_enable_warnings(),
@@ -225,6 +226,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
* library, though.
*/
(void)_glthread_GetID();
+#endif
/* Make sure that the new context has a nonzero ID. In the request,
* a zero context ID is used only to mean that we bind to no current
@@ -244,7 +246,9 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
return False;
}
+#ifndef GLX_USE_APPLEGL
_glapi_check_multithread();
+#endif
__glXLock();
if (oldGC == gc &&
More information about the mesa-commit
mailing list