Module: Mesa Branch: 7.9 Commit: d8802cd242e6ef1b5f19ce8fc927c219981ece81 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8802cd242e6ef1b5f19ce8fc927c219981ece81
Author: Jeremy Huddleston <[email protected]> Date: Sun Jun 5 19:57:52 2011 -0400 apple: ifdef out come glapi-foo on darwin Signed-off-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 8593bb32eae5368c1ba52504133b0bf200bf8e74) --- 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 3631738..ce9d778 100644 --- a/src/glx/glxcurrent.c +++ b/src/glx/glxcurrent.c @@ -234,6 +234,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw, return False; } +#ifndef GLX_USE_APPLEGL _glapi_check_multithread(); if (gc != NULL && gc->thread_id != 0 && gc->thread_id != _glthread_GetID()) { @@ -241,6 +242,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw, BadAccess, X_GLXMakeContextCurrent); return False; } +#endif if (oldGC == gc && gc->currentDrawable == draw && gc->currentReadable == read) @@ -258,7 +260,9 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw, gc->currentDpy = dpy; gc->currentDrawable = draw; gc->currentReadable = read; +#ifndef GLX_USE_APPLEGL gc->thread_id = _glthread_GetID(); +#endif __glXSetCurrentContext(gc); ret = gc->vtable->bind(gc, oldGC, draw, read); } else { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
