[Xorg-commit] xc/lib/GL/mesa/src/drv/radeon radeon_context.c,1.1.4.2,1.1.4.3 radeon_context.h,1.1.4.1,1.1.4.2 radeon_ioctl.c,1.1.4.3,1.1.4.4 radeon_tex.c,1.1.4.1,1.1.4.2 radeon_texmem.c,1.1.4.1,1.1.4.2 radeon_texstate.c,1.1.4.2,1.1.4.3 radeon_vtxfmt.c,1.1.4.1,1.1.4.2

Kaleb Keithley xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007 

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	radeon_context.c radeon_context.h radeon_ioctl.c radeon_tex.c 
	radeon_texmem.c radeon_texstate.c radeon_vtxfmt.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: radeon_context.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_context.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/radeon_context.c	20 Dec 2003 00:28:22 -0000	1.1.4.2
+++ b/radeon_context.c	23 Feb 2004 21:34:11 -0000	1.1.4.3
@@ -1,5 +1,4 @@
-/* $XdotOrg$ */
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_context.c,v 1.11 2003/12/08 22:45:30 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_context.c,v 1.13 2004/01/23 03:57:06 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -103,7 +102,7 @@
       offset = driGetRendererString( buffer, "Radeon", DRIVER_DATE,
 				     agp_mode );
 
-      sprintf( & buffer[ offset ], "%sTCL",
+      sprintf( & buffer[ offset ], " %sTCL",
 	       !(rmesa->TclFallback & RADEON_TCL_FALLBACK_TCL_DISABLE)
 	       ? "" : "NO-" );
 
@@ -542,7 +541,7 @@
 	 (radeonContextPtr) driContextPriv->driverPrivate;
 
       if (RADEON_DEBUG & DEBUG_DRI)
-	 fprintf(stderr, "%s ctx %p\n", __FUNCTION__, newCtx->glCtx);
+	 fprintf(stderr, "%s ctx %p\n", __FUNCTION__, (void *)newCtx->glCtx);
 
       if ( newCtx->dri.drawable != driDrawPriv ) {
 	 newCtx->dri.drawable = driDrawPriv;
@@ -581,7 +580,7 @@
    radeonContextPtr rmesa = (radeonContextPtr) driContextPriv->driverPrivate;
 
    if (RADEON_DEBUG & DEBUG_DRI)
-      fprintf(stderr, "%s ctx %p\n", __FUNCTION__, rmesa->glCtx);
+      fprintf(stderr, "%s ctx %p\n", __FUNCTION__, (void *)rmesa->glCtx);
 
    return GL_TRUE;
 }

Index: radeon_context.h
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h,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/radeon_context.h	26 Nov 2003 22:48:33 -0000	1.1.4.1
+++ b/radeon_context.h	23 Feb 2004 21:34:11 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_context.h,v 1.9 2003/11/13 17:22:51 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_context.h,v 1.10 2004/01/23 19:09:33 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -744,8 +744,8 @@
    GLuint vbl_seq;
    GLuint vblank_flags;
 
-   u_int64_t swap_ust;
-   u_int64_t swap_missed_ust;
+   int64_t swap_ust;
+   int64_t swap_missed_ust;
 
    GLuint swap_count;
    GLuint swap_missed_count;

Index: radeon_ioctl.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/radeon_ioctl.c	20 Dec 2003 00:28:22 -0000	1.1.4.3
+++ b/radeon_ioctl.c	23 Feb 2004 21:34:11 -0000	1.1.4.4
@@ -1,5 +1,4 @@
-/* $XdotOrg$ */
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c,v 1.14 2003/12/18 21:56:37 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c,v 1.15 2004/01/23 03:57:06 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -809,7 +808,7 @@
    rmesa = (radeonContextPtr) dPriv->driContextPriv->driverPrivate;
 
    if ( RADEON_DEBUG & DEBUG_IOCTL ) {
-      fprintf( stderr, "\n%s( %p )\n\n", __FUNCTION__, rmesa->glCtx );
+      fprintf( stderr, "\n%s( %p )\n\n", __FUNCTION__, (void *)rmesa->glCtx );
    }
 
    RADEON_FIREVERTICES( rmesa );

Index: radeon_tex.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_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/radeon_tex.c	26 Nov 2003 22:48:33 -0000	1.1.4.1
+++ b/radeon_tex.c	23 Feb 2004 21:34:11 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_tex.c,v 1.10 2003/09/28 20:15:30 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_tex.c,v 1.11 2004/01/23 03:57:06 dawes Exp $ */
 /*
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
                      VA Linux Systems Inc., Fremont, California.
@@ -231,7 +231,7 @@
    texObj->DriverData = t;
    if ( t != NULL ) {
       if ( RADEON_DEBUG & DEBUG_TEXTURE ) {
-	 fprintf( stderr, "%s( %p, %p )\n", __FUNCTION__, texObj, t );
+	 fprintf( stderr, "%s( %p, %p )\n", __FUNCTION__, (void *)texObj, (void *)t );
       }
 
       /* Initialize non-image-dependent parts of the state:
@@ -642,7 +642,7 @@
 			       struct gl_texture_object *texObj )
 {
    if ( RADEON_DEBUG & (DEBUG_STATE|DEBUG_TEXTURE) ) {
-      fprintf( stderr, "%s( %p ) unit=%d\n", __FUNCTION__, texObj,
+      fprintf( stderr, "%s( %p ) unit=%d\n", __FUNCTION__, (void *)texObj,
 	       ctx->Texture.CurrentUnit );
    }
 
@@ -660,7 +660,7 @@
    driTextureObject * t = (driTextureObject *) texObj->DriverData;
 
    if ( RADEON_DEBUG & (DEBUG_STATE|DEBUG_TEXTURE) ) {
-      fprintf( stderr, "%s( %p (target = %s) )\n", __FUNCTION__, texObj,
+      fprintf( stderr, "%s( %p (target = %s) )\n", __FUNCTION__, (void *)texObj,
 	       _mesa_lookup_enum_by_nr( texObj->Target ) );
    }
 

Index: radeon_texmem.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_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/radeon_texmem.c	26 Nov 2003 22:48:33 -0000	1.1.4.1
+++ b/radeon_texmem.c	23 Feb 2004 21:34:11 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_texmem.c,v 1.8 2003/09/28 20:15:30 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_texmem.c,v 1.9 2004/01/23 03:57:06 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -55,7 +55,7 @@
 radeonDestroyTexObj( radeonContextPtr rmesa, radeonTexObjPtr t )
 {
    if ( RADEON_DEBUG & DEBUG_TEXTURE ) {
-      fprintf( stderr, "%s( %p, %p )\n", __FUNCTION__, t, t->base.tObj );
+      fprintf( stderr, "%s( %p, %p )\n", __FUNCTION__, (void *)t, (void *)t->base.tObj );
    }
 
    if ( rmesa != NULL ) {
@@ -188,7 +188,7 @@
 
    if ( RADEON_DEBUG & DEBUG_TEXTURE ) {
       fprintf( stderr, "%s( %p, %p ) level/width/height/face = %d/%d/%d/%u\n", 
-	       __FUNCTION__, t, t->base.tObj, level, width, height, face );
+	       __FUNCTION__, (void *)t, (void *)t->base.tObj, level, width, height, face );
    }
 
    ASSERT(face < 6);
@@ -324,7 +324,7 @@
 
    if ( RADEON_DEBUG & (DEBUG_TEXTURE|DEBUG_IOCTL) ) {
       fprintf( stderr, "%s( %p, %p ) sz=%d lvls=%d-%d\n", __FUNCTION__,
-	       rmesa->glCtx, t->base.tObj, t->base.totalSize,
+	       (void *)rmesa->glCtx, (void *)t->base.tObj, t->base.totalSize,
 	       t->base.firstLevel, t->base.lastLevel );
    }
 

Index: radeon_texstate.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_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/radeon_texstate.c	6 Dec 2003 13:24:21 -0000	1.1.4.2
+++ b/radeon_texstate.c	23 Feb 2004 21:34:11 -0000	1.1.4.3
@@ -1,5 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_texstate.c,v 1.8 2003/12/02 13:02:39 alanh Exp $ */
-/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_texstate.c,v 1.9 2004/01/23 03:57:06 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -761,7 +760,7 @@
 	   || (texUnit->_Current != NULL) );
 
    if ( RADEON_DEBUG & DEBUG_TEXTURE ) {
-      fprintf( stderr, "%s( %p, %d )\n", __FUNCTION__, ctx, unit );
+      fprintf( stderr, "%s( %p, %d )\n", __FUNCTION__, (void *)ctx, unit );
    }
 
    /* Set the texture environment state.  Isn't this nice and clean?

Index: radeon_vtxfmt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.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/radeon_vtxfmt.c	26 Nov 2003 22:48:33 -0000	1.1.4.1
+++ b/radeon_vtxfmt.c	23 Feb 2004 21:34:11 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c,v 1.7 2003/09/28 20:15:30 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c,v 1.8 2004/01/23 03:57:06 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -527,7 +527,7 @@
    for (i = 0 ; i < nrverts; i++) {
       if (RADEON_DEBUG & DEBUG_VERTS) {
 	 int j;
-	 fprintf(stderr, "re-emit vertex %d to %p\n", i, rmesa->vb.dmaptr);
+	 fprintf(stderr, "re-emit vertex %d to %p\n", i, (void *)rmesa->vb.dmaptr);
 	 if (RADEON_DEBUG & DEBUG_VERBOSE)
 	    for (j = 0 ; j < rmesa->vb.vertex_size; j++) 
 	       fprintf(stderr, "\t%08x/%f\n", *(int*)&tmp[i][j], tmp[i][j]);

More information about the xorg-commit mailing list