#include "apple_glx.h"
#include "apple_glx_context.h"
-#else
-#include "glapi.h"
#endif
+#include "glapi.h"
+
/*
** We setup some dummy structures here so that the API can be used
** even if no context is current.
__glXSetCurrentContextNull(void)
{
__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_context(NULL);
#endif
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(),
* 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
return False;
}
-#ifndef GLX_USE_APPLEGL
_glapi_check_multithread();
-#endif
__glXLock();
if (oldGC == gc &&