diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-06-05 19:57:52 -0400 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-06-13 23:10:40 -0700 |
| commit | d8802cd242e6ef1b5f19ce8fc927c219981ece81 (patch) | |
| tree | 8339b1e357ee2c4171bec0c59131ae9f4e9d63f2 | |
| parent | 7c4cc8d2b9393227c65e73fc0200bcaeecbad06f (diff) | |
apple: ifdef out come glapi-foo on darwin
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 8593bb32eae5368c1ba52504133b0bf200bf8e74)
| -rw-r--r-- | 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 3631738354..ce9d77865a 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 { |