[Xorg-commit] xc/lib/GL/mesa/src/drv/i810 i810context.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	i810context.c 
Log Message:
merge XFree86 RC2 (4.3.99.902) from vendor branch

Index: i810context.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/i810/i810context.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
--- i810context.c	26 Nov 2003 22:48:31 -0000	1.1.4.1
+++ i810context.c	20 Dec 2003 00:28:21 -0000	1.1.4.2
@@ -24,7 +24,8 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810context.c,v 1.4 2003/09/28 20:15:11 alanh Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810context.c,v 1.5 2003/12/08 22:45:30 alanh Exp $ */
 
 /*
  * Authors:
@@ -317,12 +318,12 @@
           */
          int i;
 
-	 assert( is_empty_list( & imesa->swapped ) );
-
          for ( i = 0 ; i < imesa->nr_heaps ; i++ ) {
 	    driDestroyTextureHeap( imesa->texture_heaps[ i ] );
 	    imesa->texture_heaps[ i ] = NULL;
          }
+
+	 assert( is_empty_list( & imesa->swapped ) );
       }
 
       Xfree(imesa);