[Xorg-commit] xc/lib/GL/mesa/src/drv/r200 r200_context.c,1.1.4.2,1.1.4.3 r200_context.h,1.1.4.1,1.1.4.2 r200_ioctl.c,1.1.4.2,1.1.4.3 r200_maos_arrays.c,1.1.4.1,1.1.4.2 r200_tex.c,1.1.4.1,1.1.4.2 r200_texmem.c,1.1.4.1,1.1.4.2 r200_texstate.c,1.1.4.2,1.1.4.3 r200_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
- Previous message: [Xorg-commit] xc/lib/GL/mesa/src/drv/gamma gamma_state.c,1.1.4.1,1.1.4.2
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: kaleb
Update of /cvs/xorg/xc/lib/GL/mesa/src/drv/r200
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/GL/mesa/src/drv/r200
Modified Files:
Tag: XORG-CURRENT
r200_context.c r200_context.h r200_ioctl.c r200_maos_arrays.c
r200_tex.c r200_texmem.c r200_texstate.c r200_vtxfmt.c
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: r200_context.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_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/r200_context.c 20 Dec 2003 00:28:22 -0000 1.1.4.2
+++ b/r200_context.c 23 Feb 2004 21:34:08 -0000 1.1.4.3
@@ -1,5 +1,4 @@
-/* $XdotOrg$ */
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_context.c,v 1.5 2003/12/08 22:45:30 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_context.c,v 1.6 2004/01/23 03:57:05 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -545,7 +544,7 @@
(r200ContextPtr) driContextPriv->driverPrivate;
if (R200_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;
@@ -587,7 +586,7 @@
r200ContextPtr rmesa = (r200ContextPtr) driContextPriv->driverPrivate;
if (R200_DEBUG & DEBUG_DRI)
- fprintf(stderr, "%s ctx %p\n", __FUNCTION__, rmesa->glCtx);
+ fprintf(stderr, "%s ctx %p\n", __FUNCTION__, (void *)rmesa->glCtx);
r200VtxfmtUnbindContext( rmesa->glCtx );
return GL_TRUE;
Index: r200_context.h
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_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/r200_context.h 26 Nov 2003 22:48:33 -0000 1.1.4.1
+++ b/r200_context.h 23 Feb 2004 21:34:08 -0000 1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_context.h,v 1.5 2003/11/13 17:22:50 dawes Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_context.h,v 1.6 2004/01/23 19:09:33 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -838,8 +838,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: r200_ioctl.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_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/r200_ioctl.c 6 Dec 2003 13:22:43 -0000 1.1.4.2
+++ b/r200_ioctl.c 23 Feb 2004 21:34:08 -0000 1.1.4.3
@@ -1,5 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_ioctl.c,v 1.6 2003/12/02 13:02:39 alanh Exp $ */
-/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_ioctl.c,v 1.7 2004/01/23 03:57:05 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -410,7 +409,7 @@
rmesa = (r200ContextPtr) dPriv->driContextPriv->driverPrivate;
if ( R200_DEBUG & DEBUG_IOCTL ) {
- fprintf( stderr, "\n%s( %p )\n\n", __FUNCTION__, rmesa->glCtx );
+ fprintf( stderr, "\n%s( %p )\n\n", __FUNCTION__, (void *)rmesa->glCtx );
}
R200_FIREVERTICES( rmesa );
Index: r200_maos_arrays.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_maos_arrays.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/r200_maos_arrays.c 26 Nov 2003 22:48:33 -0000 1.1.4.1
+++ b/r200_maos_arrays.c 23 Feb 2004 21:34:08 -0000 1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_maos_arrays.c,v 1.4 2003/09/28 20:15:23 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_maos_arrays.c,v 1.5 2004/01/23 03:57:05 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -70,7 +70,7 @@
if (R200_DEBUG & DEBUG_VERTS)
fprintf(stderr, "%s count %d stride %d out %p\n",
- __FUNCTION__, count, stride, out);
+ __FUNCTION__, count, stride, (void *)out);
for (i = 0; i < count; i++) {
out->red = *data;
@@ -234,7 +234,7 @@
if (R200_DEBUG & DEBUG_VERTS)
fprintf(stderr, "%s count %d stride %d out %p data %p\n",
- __FUNCTION__, count, stride, out, data);
+ __FUNCTION__, count, stride, (void *)out, data);
if (stride == 12)
COPY_DWORDS( out, data, count*3 );
Index: r200_tex.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_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/r200_tex.c 26 Nov 2003 22:48:33 -0000 1.1.4.1
+++ b/r200_tex.c 23 Feb 2004 21:34:08 -0000 1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_tex.c,v 1.3 2003/09/28 20:15:25 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_tex.c,v 1.4 2004/01/23 03:57:05 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -270,7 +270,7 @@
texObj->DriverData = t;
if ( t != NULL ) {
if ( R200_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:
@@ -904,7 +904,7 @@
struct gl_texture_object *texObj )
{
if ( R200_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 );
}
@@ -922,7 +922,7 @@
driTextureObject * t = (driTextureObject *) texObj->DriverData;
if ( R200_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: r200_texmem.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_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/r200_texmem.c 26 Nov 2003 22:48:33 -0000 1.1.4.1
+++ b/r200_texmem.c 23 Feb 2004 21:34:08 -0000 1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_texmem.c,v 1.6 2003/09/28 20:15:25 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_texmem.c,v 1.7 2004/01/23 03:57:05 dawes Exp $ */
/**************************************************************************
Copyright (C) Tungsten Graphics 2002. All Rights Reserved.
@@ -60,7 +60,7 @@
r200DestroyTexObj( r200ContextPtr rmesa, r200TexObjPtr t )
{
if ( R200_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 ) {
@@ -289,7 +289,7 @@
if ( R200_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);
@@ -442,7 +442,7 @@
if ( R200_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: r200_texstate.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_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/r200_texstate.c 6 Dec 2003 13:22:43 -0000 1.1.4.2
+++ b/r200_texstate.c 23 Feb 2004 21:34:08 -0000 1.1.4.3
@@ -1,5 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_texstate.c,v 1.5 2003/12/02 13:02:39 alanh Exp $ */
-/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_texstate.c,v 1.6 2004/01/23 03:57:05 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -718,7 +717,7 @@
|| (texUnit->_Current != NULL) );
if ( R200_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: r200_vtxfmt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_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/r200_vtxfmt.c 26 Nov 2003 22:48:33 -0000 1.1.4.1
+++ b/r200_vtxfmt.c 23 Feb 2004 21:34:08 -0000 1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c,v 1.5 2003/09/28 20:15:25 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c,v 1.6 2004/01/23 03:57:06 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -557,7 +557,7 @@
for (i = 0 ; i < nrverts; i++) {
if (R200_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 (R200_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]);
- Previous message: [Xorg-commit] xc/lib/GL/mesa/src/drv/gamma gamma_state.c,1.1.4.1,1.1.4.2
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list