diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2009-01-08 15:05:08 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2009-01-08 15:05:08 +0000 |
commit | cae13a8e4f231b8c967a9ba01eba037cfad0670a (patch) | |
tree | cd20ec7af620f417e0154cb444fb41f193f6e241 /src/gallium/state_trackers | |
parent | 18ad0e3a284da13ebd6bac7a5cc5a9d17ab6efc7 (diff) |
xlib: strip out FX stuff
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r-- | src/gallium/state_trackers/xlib/fakeglx.c | 19 | ||||
-rw-r--r-- | 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 d46053d919..12895a60a2 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 e99a511d6f..446071f0fd 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 - /* |