[Xorg-commit] xc/lib/GL/mesa/src/drv/r200 r200_context.c,1.1.4.1,1.1.4.2 r200_screen.c,1.1.4.2,1.1.4.3
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Sat Dec 20 02:28:57 EET 2003
- Previous message: [Xorg-commit] xc/lib/GL/mesa/src/drv/radeon radeon_context.c,1.1.4.1,1.1.4.2 radeon_ioctl.c,1.1.4.2,1.1.4.3 radeon_screen.c,1.1.4.2,1.1.4.3
- Next message: [Xorg-commit] xc/lib/X11 ConnDis.c,1.1.4.3,1.1.4.4 Xlib.h,1.1.4.5,1.1.4.6
- 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_screen.c
Log Message:
merge XFree86 RC2 (4.3.99.902) from vendor branch
Index: r200_context.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_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
--- r200_context.c 26 Nov 2003 22:48:33 -0000 1.1.4.1
+++ r200_context.c 20 Dec 2003 00:28:22 -0000 1.1.4.2
@@ -1,4 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_context.c,v 1.4 2003/09/28 20:15:23 alanh Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_context.c,v 1.5 2003/12/08 22:45:30 alanh Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -491,12 +492,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: r200_screen.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/r200/r200_screen.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
--- r200_screen.c 6 Dec 2003 13:22:43 -0000 1.1.4.2
+++ r200_screen.c 20 Dec 2003 00:28:22 -0000 1.1.4.3
@@ -1,5 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_screen.c,v 1.6 2003/12/02 13:02:39 alanh Exp $ */
/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_screen.c,v 1.7 2003/12/18 21:56:37 dawes Exp $ */
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -40,6 +40,7 @@
#include "imports.h"
#include "context.h"
+#define STANDALONE_MMIO
#include "r200_screen.h"
#include "r200_context.h"
#include "r200_ioctl.h"
- Previous message: [Xorg-commit] xc/lib/GL/mesa/src/drv/radeon radeon_context.c,1.1.4.1,1.1.4.2 radeon_ioctl.c,1.1.4.2,1.1.4.3 radeon_screen.c,1.1.4.2,1.1.4.3
- Next message: [Xorg-commit] xc/lib/X11 ConnDis.c,1.1.4.3,1.1.4.4 Xlib.h,1.1.4.5,1.1.4.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list