KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glx: Remove some GLX_USE_APPLEGL guards around glapi 

Now that we're using glapi, we don't need some GLX_USE_APPLEGL ifdef-foo

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2011-06-08 12:03:10 -07:00
parent 1b90d7d36b
commit 3b23cf43a4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/glx/glxcurrent.c
View File

@ -43,10 +43,10 @@
#include "apple_glx.h" #include "apple_glx.h"
#include "apple_glx_context.h" #include "apple_glx_context.h"
#else
#include "glapi.h"
#endif #endif
#include "glapi.h"
/* /*
** We setup some dummy structures here so that the API can be used ** We setup some dummy structures here so that the API can be used
** even if no context is current. ** even if no context is current.
@ -160,7 +160,7 @@ _X_HIDDEN void
__glXSetCurrentContextNull(void) __glXSetCurrentContextNull(void)
{ {
__glXSetCurrentContext(&dummyContext); __glXSetCurrentContext(&dummyContext);
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) #if defined(GLX_DIRECT_RENDERING)
_glapi_set_dispatch(NULL); /* no-op functions */ _glapi_set_dispatch(NULL); /* no-op functions */
_glapi_set_context(NULL); _glapi_set_context(NULL);
#endif #endif
@ -214,7 +214,6 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
struct glx_context *oldGC = __glXGetCurrentContext(); struct glx_context *oldGC = __glXGetCurrentContext();
int ret = Success; int ret = Success;
#ifndef GLX_USE_APPLEGL
/* XXX: If this is left out, then libGL ends up not having this /* XXX: If this is left out, then libGL ends up not having this
* symbol, and drivers using it fail to load. Compare the * symbol, and drivers using it fail to load. Compare the
* implementation of this symbol to _glapi_noop_enable_warnings(), * implementation of this symbol to _glapi_noop_enable_warnings(),
@ -224,7 +223,6 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
* library, though. * library, though.
*/ */
(void)_glthread_GetID(); (void)_glthread_GetID();
#endif
/* Make sure that the new context has a nonzero ID. In the request, /* 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 * a zero context ID is used only to mean that we bind to no current
@ -244,9 +242,7 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
return False; return False;
} }
#ifndef GLX_USE_APPLEGL
_glapi_check_multithread(); _glapi_check_multithread();
#endif
__glXLock(); __glXLock();
if (oldGC == gc && if (oldGC == gc &&