Mesa (mesa_7_7_branch): apple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSX

[Jeremy Huddleston]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 287cbba9b7ebf95391f77b58f519dd76c415d355
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=287cbba9b7ebf95391f77b58f519dd76c415d355

Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Dec 24 08:47:29 2009 -0800

apple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSX

Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>

---

 src/glx/x11/dri_glx.c    |   13 -------------
 src/glx/x11/glxcurrent.c |    7 -------
 src/mesa/main/dispatch.c |    4 ----
 3 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index 4f7acb6..88487b6 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -280,8 +280,6 @@ static const __DRIextension *loader_extensions[] = {
    NULL
 };
 
-#ifndef GLX_USE_APPLEGL
-
 /**
  * Perform the required libGL-side initialization and call the client-side
  * driver's \c __driCreateNewScreen function.
@@ -475,17 +473,6 @@ CallCreateNewScreen(Display * dpy, int scrn, __GLXscreenConfigs * psc,
    return NULL;
 }
 
-#else /* !GLX_USE_APPLEGL */
-
-static void *
-CallCreateNewScreen(Display * dpy, int scrn, __GLXscreenConfigs * psc,
-                    __GLXDRIdisplayPrivate * driDpy)
-{
-   return NULL;
-}
-
-#endif /* !GLX_USE_APPLEGL */
-
 static void
 driDestroyContext(__GLXDRIcontext * context,
                   __GLXscreenConfigs * psc, Display * dpy)
diff --git a/src/glx/x11/glxcurrent.c b/src/glx/x11/glxcurrent.c
index f1e3e16..fae1bd9 100644
--- a/src/glx/x11/glxcurrent.c
+++ b/src/glx/x11/glxcurrent.c
@@ -475,13 +475,6 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
                IndirectAPI = __glXNewIndirectAPI();
             _glapi_set_dispatch(IndirectAPI);
 
-#ifdef GLX_USE_APPLEGL
-            do {
-               extern void XAppleDRIUseIndirectDispatch(void);
-               XAppleDRIUseIndirectDispatch();
-            } while (0);
-#endif
-
             state = (__GLXattribute *) (gc->client_state_private);
 
             gc->currentContextTag = reply.contextTag;
diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index 97d213e..eb0d1ff 100644
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -37,8 +37,6 @@
  * \author Brian Paul <brian at precisioninsight.com>
  */
 
-#ifndef GLX_USE_APPLEGL
-
 #include "main/glheader.h"
 #include "main/compiler.h"
 #include "glapi/glapi.h"
@@ -92,5 +90,3 @@
 #include "glapi/glapitemp.h"
 
 #endif /* USE_X86_ASM */
-
-#endif /* !GLX_USE_APPLEGL */