Mesa (gallium-xlib-rework): xlib: strip out FX stuff
Keith Whitwell
keithw at kemper.freedesktop.org
Thu Jan 8 15:12:41 UTC 2009
Module: Mesa
Branch: gallium-xlib-rework
Commit: cae13a8e4f231b8c967a9ba01eba037cfad0670a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cae13a8e4f231b8c967a9ba01eba037cfad0670a
Author: Keith Whitwell <keith at tungstengraphics.com>
Date: Thu Jan 8 15:05:08 2009 +0000
xlib: strip out FX stuff
---
src/gallium/state_trackers/xlib/fakeglx.c | 19 +------------------
src/gallium/state_trackers/xlib/xm_api.c | 8 --------
2 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/src/gallium/state_trackers/xlib/fakeglx.c b/src/gallium/state_trackers/xlib/fakeglx.c
index d46053d..12895a6 100644
--- a/src/gallium/state_trackers/xlib/fakeglx.c
+++ b/src/gallium/state_trackers/xlib/fakeglx.c
@@ -1489,9 +1489,6 @@ Fake_glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
/* Out of memory, or context/drawable depth mismatch */
return False;
}
-#ifdef FX
- FXcreateContext( xmctx->xm_visual, draw, xmctx, drawBuffer );
-#endif
}
/* Find the XMesaBuffer which corresponds to the GLXDrawable 'read' */
@@ -1509,9 +1506,6 @@ Fake_glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
/* Out of memory, or context/drawable depth mismatch */
return False;
}
-#ifdef FX
- FXcreateContext( xmctx->xm_visual, read, xmctx, readBuffer );
-#endif
}
if (no_rast &&
@@ -2017,12 +2011,6 @@ Fake_glXWaitX( void )
static const char *
get_extensions( void )
{
-#ifdef FX
- const char *fx = _mesa_getenv("MESA_GLX_FX");
- if (fx && fx[0] != 'd') {
- return EXTENSIONS;
- }
-#endif
return EXTENSIONS + 23; /* skip "GLX_MESA_set_3dfx_mode" */
}
@@ -2198,11 +2186,6 @@ Fake_glXCreateWindow( Display *dpy, GLXFBConfig config, Window win,
if (!xmbuf)
return 0;
-#ifdef FX
- /* XXX this will segfault if actually called */
- FXcreateContext(xmvis, win, NULL, xmbuf);
-#endif
-
(void) dpy;
(void) attribList; /* Ignored in GLX 1.3 */
@@ -2995,7 +2978,7 @@ Fake_glXReleaseBuffersMESA( Display *dpy, GLXDrawable d )
static Bool
Fake_glXSet3DfxModeMESA( int mode )
{
- return XMesaSetFXmode( mode );
+ return FALSE;
}
diff --git a/src/gallium/state_trackers/xlib/xm_api.c b/src/gallium/state_trackers/xlib/xm_api.c
index e99a511..446071f 100644
--- a/src/gallium/state_trackers/xlib/xm_api.c
+++ b/src/gallium/state_trackers/xlib/xm_api.c
@@ -1126,14 +1126,6 @@ XMesaBuffer XMesaGetCurrentReadBuffer( void )
}
-#ifndef FX
-GLboolean XMesaSetFXmode( GLint mode )
-{
- (void) mode;
- return GL_FALSE;
-}
-#endif
-
/*
More information about the mesa-commit
mailing list