[Xorg-commit] xc/lib/GL/mesa/src/drv/r128 r128_ioctl.c,1.1.4.2,1.1.4.3 r128_tex.c,1.1.4.1,1.1.4.2 r128_texmem.c,1.1.4.1,1.1.4.2 r128_texstate.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	r128_ioctl.c r128_tex.c r128_texmem.c r128_texstate.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: r128_ioctl.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/r128_ioctl.c	20 Dec 2003 00:28:21 -0000	1.1.4.2
+++ b/r128_ioctl.c	23 Feb 2004 21:34:06 -0000	1.1.4.3
@@ -1,5 +1,4 @@
-/* $XdotOrg$ */
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v 1.12 2003/12/18 21:56:37 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v 1.13 2004/01/23 03:57:05 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -262,7 +261,7 @@
    if ( R128_DEBUG & DEBUG_VERBOSE_API ) {
       fprintf( stderr, "\n********************************\n" );
       fprintf( stderr, "\n%s( %p )\n\n",
-	       __FUNCTION__, rmesa->glCtx );
+	       __FUNCTION__, (void *)rmesa->glCtx );
       fflush( stderr );
    }
 
@@ -340,7 +339,7 @@
 
    if ( R128_DEBUG & DEBUG_VERBOSE_API ) {
       fprintf( stderr, "\n%s( %p ): page=%d\n\n",
-	       __FUNCTION__, rmesa->glCtx, rmesa->sarea->pfCurrentPage );
+	       __FUNCTION__, (void *)rmesa->glCtx, rmesa->sarea->pfCurrentPage );
    }
 
    FLUSH_BATCH( rmesa );

Index: r128_tex.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r128/r128_tex.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/r128_tex.c	26 Nov 2003 22:48:33 -0000	1.1.4.1
+++ b/r128_tex.c	23 Feb 2004 21:34:06 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tex.c,v 1.15 2003/09/28 20:15:21 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tex.c,v 1.16 2004/01/23 03:57:05 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -141,7 +141,7 @@
    r128TexObjPtr t;
 
    if ( R128_DEBUG & DEBUG_VERBOSE_API ) {
-      fprintf( stderr, "%s( %p )\n", __FUNCTION__, texObj );
+      fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)texObj );
    }
 
    t = (r128TexObjPtr) CALLOC_STRUCT( r128_tex_obj );
@@ -538,7 +538,7 @@
 			       struct gl_texture_object *tObj )
 {
    if ( R128_DEBUG & DEBUG_VERBOSE_API ) {
-      fprintf( stderr, "%s( %p ) unit=%d\n", __FUNCTION__, tObj,
+      fprintf( stderr, "%s( %p ) unit=%d\n", __FUNCTION__, (void *)tObj,
 	       ctx->Texture.CurrentUnit );
    }
 

Index: r128_texmem.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r128/r128_texmem.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/r128_texmem.c	26 Nov 2003 22:48:33 -0000	1.1.4.1
+++ b/r128_texmem.c	23 Feb 2004 21:34:06 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_texmem.c,v 1.2 2003/09/28 20:15:21 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_texmem.c,v 1.3 2004/01/23 03:57:05 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -245,7 +245,7 @@
 
    if ( R128_DEBUG & DEBUG_VERBOSE_API ) {
       fprintf( stderr, "%s( %p, %p )\n",
-	       __FUNCTION__, rmesa->glCtx, t );
+	       __FUNCTION__, (void *)rmesa->glCtx, (void *)t );
    }
 
    assert(t);

Index: r128_texstate.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r128/r128_texstate.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/r128_texstate.c	6 Dec 2003 13:22:43 -0000	1.1.4.2
+++ b/r128_texstate.c	23 Feb 2004 21:34:06 -0000	1.1.4.3
@@ -1,5 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_texstate.c,v 1.3 2003/12/02 13:02:38 alanh Exp $ */
-/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_texstate.c,v 1.4 2004/01/23 03:57:05 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -62,7 +61,7 @@
    assert(baseImage);
 
    if ( R128_DEBUG & DEBUG_VERBOSE_API )
-      fprintf( stderr, "%s( %p )\n", __FUNCTION__, tObj );
+      fprintf( stderr, "%s( %p )\n", __FUNCTION__, (void *)tObj );
 
    switch (baseImage->TexFormat->MesaFormat) {
    case MESA_FORMAT_ARGB8888:
@@ -205,7 +204,7 @@
 
    if ( R128_DEBUG & DEBUG_VERBOSE_API ) {
       fprintf( stderr, "%s( %p, %d )\n",
-	       __FUNCTION__, ctx, unit );
+	       __FUNCTION__, (void *)ctx, unit );
    }
 
    if ( unit == 0 ) {