xlib: remove dummy GLX_MESA_set_3dfx_mode implementation

The implementation is a simple 'return EGL_FALSE'. Stop pretending and
simply remove it.

Note: the removal of XMesa API is fine, since there hasn't been any
users for it in years.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/docs/relnotes/17.4.0.html b/docs/relnotes/17.4.0.html
index b5f4476ce19c956add962d693fb6319168274008..8b32c4e6bda295a07646e08924107c7f255d45fa 100644 (file)
--- a/docs/relnotes/17.4.0.html
+++ b/docs/relnotes/17.4.0.html
@@ -61,7 +61,7 @@ TBD
 <h2>Changes</h2>
 
 <ul>
-TBD
+<li>Remove incomplete GLX_MESA_set_3dfx_mode from the Xlib libGL</li>
 </ul>
 
 </div>

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index fa923de9c3c6bfaa63838ec60374f4ab59951c43..22d878eb80d2c0f4c475b6163715a3a559a3f07d 100644 (file)
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -2749,16 +2749,6 @@ Fake_glXReleaseBuffersMESA( Display *dpy, GLXDrawable d )
 
 
 
-/*** GLX_MESA_set_3dfx_mode ***/
-
-static Bool
-Fake_glXSet3DfxModeMESA( int mode )
-{
-   return XMesaSetFXmode( mode );
-}
-
-
-
 /*** GLX_MESA_agp_offset ***/
 
 static GLuint
@@ -2984,9 +2974,6 @@ _mesa_GetGLXDispatchTable(void)
    /*** GLX_MESA_pixmap_colormap ***/
    glx.CreateGLXPixmapMESA = Fake_glXCreateGLXPixmapMESA;
 
-   /*** GLX_MESA_set_3dfx_mode ***/
-   glx.Set3DfxModeMESA = Fake_glXSet3DfxModeMESA;
-
    /*** GLX_EXT_texture_from_pixmap ***/
    glx.BindTexImageEXT = Fake_glXBindTexImageEXT;
    glx.ReleaseTexImageEXT = Fake_glXReleaseTexImageEXT;

diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 40d73006bbe8bde493db5924d7e3e77aa99512cf..e84e238673325952c3b06bd1fa2bbd7a9e763ac8 100644 (file)
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1004,21 +1004,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_EXT_texture_from_pixmap */
 
 void PUBLIC
@@ -1065,7 +1050,6 @@ _glxapi_get_extensions(void)
       "GLX_MESA_copy_sub_buffer",
       "GLX_MESA_release_buffers",
       "GLX_MESA_pixmap_colormap",
-      "GLX_MESA_set_3dfx_mode",
       "GLX_SGIX_fbconfig",
       "GLX_SGIX_pbuffer",
       "GLX_EXT_texture_from_pixmap",
@@ -1237,9 +1221,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/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h
index 18e01b06620dbc2b239bba6f5a997693d1f5b009..7bccc50aa788ae509e8e999c3f88dd8ca6b41a07 100644 (file)
--- a/src/mesa/drivers/x11/glxapi.h
+++ b/src/mesa/drivers/x11/glxapi.h
@@ -183,9 +183,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_EXT_texture_from_pixmap ***/
    void (*BindTexImageEXT)(Display *dpy, GLXDrawable drawable, int buffer,
                            const int *attrib_list);

diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index ec2a73cb369f79714d8d5a7476e611504980baaf..069e9e12b98af19fd15e263b7475397d162b673d 100644 (file)
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1314,14 +1314,6 @@ Display *XMesaGetCurrentDisplay(void)
 
 
 
-GLboolean XMesaSetFXmode( GLint mode )
-{
-   (void) mode;
-   return GL_FALSE;
-}
-
-
-
 /*
  * Copy the back buffer to the front buffer.  If there's no back buffer
  * this is a no-op.

diff --git a/src/mesa/drivers/x11/xmesa.h b/src/mesa/drivers/x11/xmesa.h
index 84b2b27006d4d2f2a853c9ab3a179227fa1e2fc0..562b9f38cde2ef474da1ac2217db6e7d343a1739 100644 (file)
--- a/src/mesa/drivers/x11/xmesa.h
+++ b/src/mesa/drivers/x11/xmesa.h
@@ -85,14 +85,6 @@ extern "C" {
 #define XMESA_EXTENSIONS 2
 
 
-/*
- * Values passed to XMesaSetFXmode:
- */
-#define XMESA_FX_WINDOW       1
-#define XMESA_FX_FULLSCREEN   2
-
-
-
 typedef struct xmesa_context *XMesaContext;
 
 typedef struct xmesa_visual *XMesaVisual;
@@ -343,20 +335,6 @@ extern unsigned long XMesaDitherColor( XMesaContext xmesa,
 
 
 
-/*
- * 3Dfx Glide driver only!
- * Set 3Dfx/Glide full-screen or window rendering mode.
- * Input:  mode - either XMESA_FX_WINDOW (window rendering mode) or
- *                XMESA_FX_FULLSCREEN (full-screen rendering mode)
- * Return:  GL_TRUE if success
- *          GL_FALSE if invalid mode or if not using 3Dfx driver
- *
- * New in Mesa 2.6.
- */
-extern GLboolean XMesaSetFXmode( GLint mode );
-
-
-
 /*
  * Reallocate the back/depth/stencil/accum/etc/ buffers associated with
  * buffer <b> if its size has changed.