xlib: remove XMesaMakeCurrent, use XMesaMakeCurrent2 always

diff --git a/src/gallium/state_trackers/xlib/fakeglx.c b/src/gallium/state_trackers/xlib/fakeglx.c
index 4dc45adcb51dd0a6f7b3062d1e02d181c2bf1195..00cefe799d8dfeddb5b3695029e1bd45ed3b1abd 100644 (file)
--- a/src/gallium/state_trackers/xlib/fakeglx.c
+++ b/src/gallium/state_trackers/xlib/fakeglx.c
@@ -1534,7 +1534,7 @@ Fake_glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
    }
    else if (!ctx && !draw && !read) {
       /* release current context w/out assigning new one. */
-      XMesaMakeCurrent( NULL, NULL );
+      XMesaMakeCurrent2( NULL, NULL, NULL );
       MakeCurrent_PrevContext = 0;
       MakeCurrent_PrevDrawable = 0;
       MakeCurrent_PrevReadable = 0;

diff --git a/src/gallium/state_trackers/xlib/old_xmesa.h b/src/gallium/state_trackers/xlib/old_xmesa.h
index a60ef96ee0d1ce8136e36cd7086b37dac898f381..d1f585e329999eb046c053326ec1d79362c6ee5f 100644 (file)
--- a/src/gallium/state_trackers/xlib/old_xmesa.h
+++ b/src/gallium/state_trackers/xlib/old_xmesa.h
@@ -168,20 +168,6 @@ extern XMesaContext XMesaCreateContext( XMesaVisual v,
 extern void XMesaDestroyContext( XMesaContext c );
 
 
-#ifdef XFree86Server
-/*
- * These are the extra routines required for integration with XFree86.
- * None of these routines should be user visible. -KEM
- */
-extern GLboolean XMesaForceCurrent( XMesaContext c );
-
-extern GLboolean XMesaLoseCurrent( XMesaContext c );
-
-extern GLboolean XMesaCopyContext( XMesaContext src,
-                                  XMesaContext dst,
-                                  GLuint mask );
-#endif /* XFree86Server */
-
 
 /*
  * Create an XMesaBuffer from an X window.
@@ -213,13 +199,6 @@ extern XMesaBuffer XMesaFindBuffer( Display *dpy,
 
 
 
-/*
- * Bind a buffer to a context and make the context the current one.
- */
-extern GLboolean XMesaMakeCurrent( XMesaContext c,
-                                  XMesaBuffer b );
-
-
 /*
  * Bind two buffers (read and draw) to a context and make the
  * context the current one.

diff --git a/src/gallium/state_trackers/xlib/xm_api.c b/src/gallium/state_trackers/xlib/xm_api.c
index b0dba325036e4f22347b9f0f9833c386ca9e4ce2..35d4d3c6dc866458a11ea9e40cbeb47cdc1605dc 100644 (file)
--- a/src/gallium/state_trackers/xlib/xm_api.c
+++ b/src/gallium/state_trackers/xlib/xm_api.c
@@ -1029,13 +1029,6 @@ xmesa_check_and_update_buffer_size(XMesaContext xmctx, XMesaBuffer drawBuffer)
 }
 
 
-/*
- * Bind buffer b to context c and make c the current rendering context.
- */
-GLboolean XMesaMakeCurrent( XMesaContext c, XMesaBuffer b )
-{
-   return XMesaMakeCurrent2( c, b, b );
-}
 
 
 /*