From 94222d58e7b4bd452711057828922dbf2cf1c9d7 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 8 Jan 2009 15:10:41 +0000
Subject: [PATCH] xlib: strip out more 3dfx stuff

---
 src/gallium/state_trackers/xlib/fakeglx.c | 15 +--------------
 src/gallium/state_trackers/xlib/glxapi.c  | 21 ---------------------
 src/gallium/state_trackers/xlib/glxapi.h  |  3 ---
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/gallium/state_trackers/xlib/fakeglx.c b/src/gallium/state_trackers/xlib/fakeglx.c
index 00cdcbe9634..864f355a689 100644
--- a/src/gallium/state_trackers/xlib/fakeglx.c
+++ b/src/gallium/state_trackers/xlib/fakeglx.c
@@ -76,7 +76,6 @@
 #define VENDOR "Brian Paul"
 
 #define EXTENSIONS \
-   "GLX_MESA_set_3dfx_mode " \
    "GLX_MESA_copy_sub_buffer " \
    "GLX_MESA_pixmap_colormap " \
    "GLX_MESA_release_buffers " \
@@ -2011,7 +2010,7 @@ Fake_glXWaitX( void )
 static const char *
 get_extensions( void )
 {
-   return EXTENSIONS + 23; /* skip "GLX_MESA_set_3dfx_mode" */
+   return EXTENSIONS;
 }
 
 
@@ -2973,15 +2972,6 @@ Fake_glXReleaseBuffersMESA( Display *dpy, GLXDrawable d )
 
 
 
-/*** GLX_MESA_set_3dfx_mode ***/
-
-static Bool
-Fake_glXSet3DfxModeMESA( int mode )
-{
-   return FALSE;
-}
-
-
 
 /*** GLX_NV_vertex_array range ***/
 static void *
@@ -3182,9 +3172,6 @@ _mesa_GetGLXDispatchTable(void)
    /*** GLX_MESA_pixmap_colormap ***/
    glx.CreateGLXPixmapMESA = Fake_glXCreateGLXPixmapMESA;
 
-   /*** GLX_MESA_set_3dfx_mode ***/
-   glx.Set3DfxModeMESA = Fake_glXSet3DfxModeMESA;
-
    /*** GLX_NV_vertex_array_range ***/
    glx.AllocateMemoryNV = Fake_glXAllocateMemoryNV;
    glx.FreeMemoryNV = Fake_glXFreeMemoryNV;
diff --git a/src/gallium/state_trackers/xlib/glxapi.c b/src/gallium/state_trackers/xlib/glxapi.c
index d501aa1e629..15b80cc7cd0 100644
--- a/src/gallium/state_trackers/xlib/glxapi.c
+++ b/src/gallium/state_trackers/xlib/glxapi.c
@@ -1000,21 +1000,6 @@ glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colorm
 
 
 
-/*** GLX_MESA_set_3dfx_mode ***/
-
-Bool PUBLIC
-glXSet3DfxModeMESA(int mode)
-{
-   struct _glxapi_table *t;
-   Display *dpy = glXGetCurrentDisplay();
-   GET_DISPATCH(dpy, t);
-   if (!t)
-      return False;
-   return (t->Set3DfxModeMESA)(mode);
-}
-
-
-
 /*** GLX_NV_vertex_array_range ***/
 
 void PUBLIC *
@@ -1141,9 +1126,6 @@ _glxapi_get_extensions(void)
 #ifdef GLX_MESA_pixmap_colormap
       "GLX_MESA_pixmap_colormap",
 #endif
-#ifdef GLX_MESA_set_3dfx_mode
-      "GLX_MESA_set_3dfx_mode",
-#endif
 #ifdef GLX_SGIX_fbconfig
       "GLX_SGIX_fbconfig",
 #endif
@@ -1320,9 +1302,6 @@ static struct name_address_pair GLX_functions[] = {
    /*** GLX_MESA_release_buffers ***/
    { "glXReleaseBuffersMESA", (__GLXextFuncPtr) glXReleaseBuffersMESA },
 
-   /*** GLX_MESA_set_3dfx_mode ***/
-   { "glXSet3DfxModeMESA", (__GLXextFuncPtr) glXSet3DfxModeMESA },
-
    /*** GLX_ARB_get_proc_address ***/
    { "glXGetProcAddressARB", (__GLXextFuncPtr) glXGetProcAddressARB },
 
diff --git a/src/gallium/state_trackers/xlib/glxapi.h b/src/gallium/state_trackers/xlib/glxapi.h
index 37de81e55ac..11740e0e0a7 100644
--- a/src/gallium/state_trackers/xlib/glxapi.h
+++ b/src/gallium/state_trackers/xlib/glxapi.h
@@ -184,9 +184,6 @@ struct _glxapi_table {
    /*** GLX_MESA_pixmap_colormap ***/
    GLXPixmap (*CreateGLXPixmapMESA)(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colormap cmap);
 
-   /*** GLX_MESA_set_3dfx_mode ***/
-   Bool (*Set3DfxModeMESA)(int mode);
-
    /*** GLX_NV_vertex_array_range ***/
    void * (*AllocateMemoryNV)( GLsizei size,
                                GLfloat readFrequency,
-- 
2.30.2