[Xorg-commit] xc/lib/GL/mesa/src/drv/r128 r128_context.c,1.1.4.1,1.1.4.2 r128_ioctl.c,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Sat Dec 20 02:28:57 EET 2003
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_context.c r128_ioctl.c
Log Message:
merge XFree86 RC2 (4.3.99.902) from vendor branch
Index: r128_context.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r128/r128_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
--- r128_context.c 26 Nov 2003 22:48:33 -0000 1.1.4.1
+++ r128_context.c 20 Dec 2003 00:28:21 -0000 1.1.4.2
@@ -1,4 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_context.c,v 1.9 2003/09/28 20:15:19 alanh Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_context.c,v 1.10 2003/12/08 22:45:30 alanh Exp $ */
/**************************************************************************
Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -269,12 +270,12 @@
*/
int i;
- assert( is_empty_list( & rmesa->swapped ) );
-
for ( i = 0 ; i < rmesa->nr_heaps ; i++ ) {
driDestroyTextureHeap( rmesa->texture_heaps[ i ] );
rmesa->texture_heaps[ i ] = NULL;
}
+
+ assert( is_empty_list( & rmesa->swapped ) );
}
FREE( rmesa );
Index: r128_ioctl.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.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
--- r128_ioctl.c 26 Nov 2003 22:48:33 -0000 1.1.4.1
+++ r128_ioctl.c 20 Dec 2003 00:28:21 -0000 1.1.4.2
@@ -1,4 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v 1.11 2003/09/28 20:15:20 alanh Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v 1.12 2003/12/18 21:56:37 dawes Exp $ */
/**************************************************************************
Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -32,6 +33,7 @@
*
*/
+#define STANDALONE_MMIO
#include "r128_context.h"
#include "r128_state.h"
#include "r128_ioctl.h"
More information about the xorg-commit
mailing list