[Xorg-commit] xc/lib/GL/mesa/src/drv/tdfx tdfx_context.c,1.1.4.1,1.1.4.2 tdfx_screen.c,1.1.4.1,1.1.4.2 tdfx_texman.c,1.1.4.1,1.1.4.2 tdfx_texstate.c,1.1.4.1,1.1.4.2 tdfx_tris.c,1.1.4.1,1.1.4.2

Wed May 9 17:30:30 EEST 2007

Committed by: kaleb

Update of /cvs/xorg/xc/lib/GL/mesa/src/drv/tdfx
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/GL/mesa/src/drv/tdfx

Modified Files:
      Tag: XORG-CURRENT
	tdfx_context.c tdfx_screen.c tdfx_texman.c tdfx_texstate.c 
	tdfx_tris.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: tdfx_context.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2

--- a/tdfx_context.c	26 Nov 2003 22:48:35 -0000	1.1.4.1
+++ b/tdfx_context.c	23 Feb 2004 21:34:15 -0000	1.1.4.2
@@ -23,7 +23,7 @@
  * 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.13 2003/09/28 20:15:36 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c,v 1.14 2004/01/23 03:57:07 dawes Exp $ */
 
 /*
  * Original rewrite:
@@ -346,7 +346,7 @@
    FxI32 result[2];
 
    if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) {
-      fprintf( stderr, "%s( %p )\n", __FUNCTION__, fxMesa );
+      fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)fxMesa );
    }
 
 #if DEBUG_LOCKING
@@ -461,7 +461,7 @@
    tdfxContextPtr fxMesa = (tdfxContextPtr) driContextPriv->driverPrivate;
 
    if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) {
-      fprintf( stderr, "%s( %p )\n", __FUNCTION__, fxMesa );
+      fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)fxMesa );
    }
 
    if ( fxMesa ) {
@@ -503,7 +503,7 @@
    tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
 
    if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) {
-      fprintf( stderr, "%s( %p )\n", __FUNCTION__, driContextPriv );
+      fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)driContextPriv );
    }
 
    if ( driContextPriv && (tdfxContextPtr) driContextPriv == fxMesa ) {
@@ -521,7 +521,7 @@
                  __DRIdrawablePrivate *driReadPriv )
 {
    if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) {
-      fprintf( stderr, "%s( %p )\n", __FUNCTION__, driContextPriv );
+      fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)driContextPriv );
    }
 
    if ( driContextPriv ) {

Index: tdfx_screen.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/tdfx_screen.c	26 Nov 2003 22:48:35 -0000	1.1.4.1
+++ b/tdfx_screen.c	23 Feb 2004 21:34:15 -0000	1.1.4.2
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.c,v 1.4 2003/09/28 20:15:37 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.c,v 1.5 2004/01/23 03:57:07 dawes Exp $ */
 
 /*
  * Original rewrite:
@@ -118,7 +118,7 @@
 tdfxInitDriver( __DRIscreenPrivate *sPriv )
 {
    if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) {
-      fprintf( stderr, "%s( %p )\n", __FUNCTION__, sPriv );
+      fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)sPriv );
    }
 
    /* Check the DRI externsion version */
@@ -195,7 +195,7 @@
    GLframebuffer *mesaBuffer;
 
    if ( TDFX_DEBUG & DEBUG_VERBOSE_DRI ) {
-      fprintf( stderr, "%s( %p )\n", __FUNCTION__, driDrawPriv );
+      fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)driDrawPriv );
    }
 
    mesaBuffer = (GLframebuffer *) driDrawPriv->driverPrivate;

Index: tdfx_texman.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/tdfx_texman.c	26 Nov 2003 22:48:35 -0000	1.1.4.1
+++ b/tdfx_texman.c	23 Feb 2004 21:34:15 -0000	1.1.4.2
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.c,v 1.6 2003/09/28 20:15:37 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.c,v 1.7 2004/01/23 03:57:07 dawes Exp $ */
 
 /*
  * Original rewrite:
@@ -880,7 +880,7 @@
     tdfxTexInfo *ti = TDFX_TEXTURE_DATA(tObj);
 
     if (MESA_VERBOSE & VERBOSE_DRIVER) {
-        fprintf(stderr, "fxmesa: %s(%p (%d))\n", __FUNCTION__, tObj, tObj->Name);
+        fprintf(stderr, "fxmesa: %s(%p (%d))\n", __FUNCTION__, (void *)tObj, tObj->Name);
     }
 
     /*

Index: tdfx_texstate.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/tdfx_texstate.c	26 Nov 2003 22:48:35 -0000	1.1.4.1
+++ b/tdfx_texstate.c	23 Feb 2004 21:34:15 -0000	1.1.4.2
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.c,v 1.3 2003/09/28 20:15:37 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.c,v 1.4 2003/12/22 17:48:03 tsi Exp $ */
 
 /*
  * Original rewrite:
@@ -1478,6 +1478,7 @@
    fxMesa->dirty |= TDFX_UPLOAD_TEXTURE_ENV;
 }
 
+#ifdef UNUSED
 static void print_state(tdfxContextPtr fxMesa)
 {
    GLcontext *ctx = fxMesa->glCtx;
@@ -1499,7 +1500,7 @@
           fxMesa->TexState.EnvMode[1]);
    printf("   BaseFmt: GL=0x%x  Gr:0x%x\n", base1, fxMesa->TexState.TexFormat[1]);
 }
-
+#endif
 
 /*
  * When we're only using a single texture unit, we always use the 0th

Index: tdfx_tris.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/tdfx_tris.c	26 Nov 2003 22:48:35 -0000	1.1.4.1
+++ b/tdfx_tris.c	23 Feb 2004 21:34:15 -0000	1.1.4.2
@@ -23,7 +23,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.c,v 1.5 2003/09/28 20:15:38 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.c,v 1.6 2004/01/23 03:57:07 dawes Exp $ */
 
 /* Authors:
  *    Keith Whitwell <keith at tungstengraphics.com>
@@ -216,7 +216,7 @@
 {
    tdfxContextPtr imesa = TDFX_CONTEXT( ctx );
 
-   fprintf(stderr, "vertex at %p\n", v);
+   fprintf(stderr, "vertex at %p\n", (void *)v);
 
    if (imesa->vertexFormat == TDFX_LAYOUT_TINY) {
       fprintf(stderr, "x %f y %f z %f\n", v->v.x, v->v.y, v->v.z);



