Eliminate use of deprecated GetBufferSize interface.

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index dd40544d49057621607f85531c0f8e4ec4d71746..5ac1fb598635a53787c08a152f3013f568af2c0b 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -23,19 +23,14 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c,v 1.12 2003/05/08 09:25:35 herrb Exp $ */
 
-/*
- * New fixes:
- *     Daniel Borca <dborca@users.sourceforge.net>, 19 Jul 2004
- *
- * Original rewrite:
- *     Gareth Hughes <gareth@valinux.com>, 29 Sep - 1 Oct 2000
- *
- * Authors:
- *     Gareth Hughes <gareth@valinux.com>
- *     Brian Paul <brianp@valinux.com>
+/**
+ * \file tdfx_context.c
+ * Context management functions for 3Dfx hardware.
  *
+ * \author Gareth Hughes <gareth@valinux.com> (original rewrite 29 Sep - 1 Oct 2000)
+ * \author Brian Paul <brianp@valinux.com>
+ * \author Daniel Borca <dborca@users.sourceforge.net> (new fixes 19 Jul 2004)
  */
 
 #include <dlfcn.h>
@@ -703,6 +698,7 @@ tdfxMakeCurrent( __DRIcontextPrivate *driContextPriv,
         UNLOCK_HARDWARE( newFx );
       }
 
+       driUpdateFramebufferSize(newCtx, driDrawPriv);
       _mesa_make_current( newCtx,
                           (GLframebuffer *) driDrawPriv->driverPrivate,
                           (GLframebuffer *) driReadPriv->driverPrivate );

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_dd.c b/src/mesa/drivers/dri/tdfx/tdfx_dd.c
index c2f3185dc476e49d046e3d8e74add8ee505da2a7..bace05af89c4c0fd51dadd9908c178c9a6d8b1bf 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_dd.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_dd.c
@@ -23,16 +23,13 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.c,v 1.10 2002/10/30 12:52:00 alanh Exp $ */
 
-/*
- * Original rewrite:
- *     Gareth Hughes <gareth@valinux.com>, 29 Sep - 1 Oct 2000
- *
- * Authors:
- *     Gareth Hughes <gareth@valinux.com>
- *     Brian Paul <brianp@valinux.com>
- *
+/**
+ * \file tdfx_dd.c
+ * Device driver interface functions for 3Dfx based cards.
+ * 
+ * \author Gareth Hughes <gareth@valinux.com> (Original rewrite 29 Sep - 1 Oct 2000)
+ * \author Brian Paul <brianp@valinux.com>
  */
 
 #include "tdfx_context.h"
@@ -50,7 +47,7 @@
 #endif
 
 
-#define TDFX_DATE      "20040719"
+#define DRIVER_DATE    "20061113"
 
 
 /* These are used in calls to FX_grColorMaskv() */
@@ -81,7 +78,7 @@ static const GLubyte *tdfxDDGetString( GLcontext *ctx, GLenum name )
       UNLOCK_HARDWARE(fxMesa);
 
       strcpy( buffer, "Mesa DRI " );
-      strcat( buffer, TDFX_DATE );
+      strcat( buffer, DRIVER_DATE );
       strcat( buffer, " " );
 
       if ( strcmp( hardware, "Voodoo3 (tm)" ) == 0 ) {
@@ -138,21 +135,6 @@ static const GLubyte *tdfxDDGetString( GLcontext *ctx, GLenum name )
 }
 
 
-/* Return uptodate buffer size information.
- */
-static void tdfxDDGetBufferSize( GLframebuffer *buffer,
-                                GLuint *width, GLuint *height )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
-
-   LOCK_HARDWARE( fxMesa );
-   *width = fxMesa->width;
-   *height = fxMesa->height;
-   UNLOCK_HARDWARE( fxMesa );
-}
-
-
 #define VISUAL_EQUALS_RGBA(vis, r, g, b, a)        \
    ((vis->redBits == r) &&                         \
     (vis->greenBits == g) &&                       \
@@ -167,7 +149,6 @@ void tdfxDDInitDriverFuncs( const __GLcontextModes *visual,
    }
 
    functions->GetString                = tdfxDDGetString;
-   functions->GetBufferSize    = tdfxDDGetBufferSize;
 
    /* Accelerated paths
     */