summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/xlib
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/pipe/xlib')
-rw-r--r--src/mesa/pipe/xlib/xm_api.c17
-rw-r--r--src/mesa/pipe/xlib/xmesaP.h10
2 files changed, 0 insertions, 27 deletions
diff --git a/src/mesa/pipe/xlib/xm_api.c b/src/mesa/pipe/xlib/xm_api.c
index 16ec304a19..878ee30be9 100644
--- a/src/mesa/pipe/xlib/xm_api.c
+++ b/src/mesa/pipe/xlib/xm_api.c
@@ -1616,10 +1616,6 @@ void XMesaDestroyContext( XMesaContext c )
{
GLcontext *mesaCtx = &c->mesa;
-#ifdef FX
- FXdestroyContext( XMESA_BUFFER(mesaCtx->DrawBuffer) );
-#endif
-
_mesa_free_context_data( mesaCtx );
_mesa_free( c );
}
@@ -1879,11 +1875,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.
*/
@@ -2038,10 +2029,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) && !defined(XFree86Server)
@@ -2108,10 +2095,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) && !defined(XFree86Server)
diff --git a/src/mesa/pipe/xlib/xmesaP.h b/src/mesa/pipe/xlib/xmesaP.h
index b7c510280b..9e0c79a139 100644
--- a/src/mesa/pipe/xlib/xmesaP.h
+++ b/src/mesa/pipe/xlib/xmesaP.h
@@ -29,9 +29,6 @@
#include "GL/xmesa.h"
#include "mtypes.h"
-#if defined(FX)
-#include "GL/fxmesa.h"
-#endif
#ifdef XFree86Server
#include "xm_image.h"
#endif
@@ -268,13 +265,6 @@ struct xmesa_buffer {
unsigned long alloced_colors[256];
#endif
-#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 */