fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 17:58:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

apple: ifdef out come glapi-foo on darwin

Browse source 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 8593bb32ea)
This commit is contained in:
Jeremy Huddleston 2011-06-05 19:57:52 -04:00
parent 7c4cc8d2b9
commit d8802cd242
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glx/glxcurrent.c
View file

@ -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 {