Commit 963727ae authored by Guillem Jover's avatar Guillem Jover Committed by Brian Paul
Browse files

Remove remnants of legacy glide support


Signed-off-by: Guillem Jover's avatarGuillem Jover <guillem@hadrons.org>
Signed-off-by: Brian Paul's avatarBrian Paul <brianp@vmware.com>
parent 00605518
......@@ -84,8 +84,6 @@ See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details.
<li>MESA_GAMMA - gamma correction coefficients for red, green, blue channels
<li>MESA_XSYNC - enable synchronous X behavior (for debugging only)
<li>MESA_GLX_FORCE_CI - if set, force GLX to treat 8bpp visuals as CI visuals
<li>MESA_GLX_FX - set to either "fullscreen" for full-screen rendering,
"window" to render into a window, or "disable" to disable the Glide driver.
<li>MESA_GLX_FORCE_ALPHA - if set, forces RGB windows to have an alpha channel.
<li>MESA_GLX_DEPTH_BITS - specifies default number of bits for depth buffer.
<li>MESA_GLX_ALPHA_BITS - specifies default number of bits for alpha channel.
......
......@@ -305,7 +305,6 @@ Documentation for other environments (some may be very out of date):
<UL>
<li><A HREF="README.VMS">README.VMS</A> - VMS
<LI><A HREF="README.GGI">README.GGI</A> - GGI
<LI><A HREF="README.3DFX">README.3DFX</A> - 3Dfx/Glide driver
<LI><A HREF="README.AMIWIN">README.AMIWIN</A> - Amiga Amiwin
<LI><A HREF="README.D3D">README.D3D</A> - Direct3D driver
<LI><A HREF="README.DJ">README.DJ</A> - DJGPP
......
......@@ -1357,9 +1357,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' */
......@@ -1377,9 +1374,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
}
MakeCurrent_PrevContext = ctx;
......@@ -1872,12 +1866,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" */
}
......@@ -2053,11 +2041,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 */
......
......@@ -1468,10 +1468,6 @@ void XMesaDestroyContext( XMesaContext c )
{
struct gl_context *mesaCtx = &c->mesa;
#ifdef FX
FXdestroyContext( XMESA_BUFFER(mesaCtx->DrawBuffer) );
#endif
_mesa_meta_free( mesaCtx );
_swsetup_DestroyContext( mesaCtx );
......@@ -1719,11 +1715,6 @@ GLboolean XMesaMakeCurrent2( XMesaContext c, XMesaBuffer drawBuffer,
c->xm_buffer = drawBuffer;
#ifdef FX
if (FXmakeCurrent( drawBuffer ))
return GL_TRUE;
#endif
/* Call this periodically to detect when the user has begun using
* GL rendering from multiple threads.
*/
......@@ -1810,14 +1801,11 @@ XMesaBuffer XMesaGetCurrentReadBuffer( void )
#ifndef FX
GLboolean XMesaSetFXmode( GLint mode )
{
(void) mode;
return GL_FALSE;
}
#endif
......@@ -1842,10 +1830,6 @@ void XMesaSwapBuffers( XMesaBuffer b )
_mesa_notifySwapBuffers(ctx);
if (b->db_mode) {
#ifdef FX
if (FXswapBuffers(b))
return;
#endif
if (b->backxrb->ximage) {
/* Copy Ximage (back buf) from client memory to server window */
#if defined(USE_XSHM)
......@@ -1910,10 +1894,6 @@ void XMesaCopySubBuffer( XMesaBuffer b, int x, int y, int width, int height )
if (b->db_mode) {
int yTop = b->mesa_buffer.Height - y - height;
#ifdef FX
if (FXswapBuffers(b))
return;
#endif
if (b->backxrb->ximage) {
/* Copy Ximage from host's memory to server's window */
#if defined(USE_XSHM)
......
......@@ -249,13 +249,6 @@ struct xmesa_buffer {
int num_alloced;
unsigned long alloced_colors[256];
#if defined( FX )
/* For 3Dfx Glide only */
GLboolean FXisHackUsable; /* Can we render into window? */
GLboolean FXwindowHack; /* Are we rendering into a window? */
fxMesaContext FXctx;
#endif
/* GLX_EXT_texture_from_pixmap */
GLint TextureTarget; /** GLX_TEXTURE_1D_EXT, for example */
GLint TextureFormat; /** GLX_TEXTURE_FORMAT_RGB_EXT, for example */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment