[Xorg-commit] xc/lib/GL/mesa/src/drv/mga mga_xmesa.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

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

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

Index: mga_xmesa.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.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
--- mga_xmesa.c	6 Dec 2003 13:22:43 -0000	1.1.4.2
+++ mga_xmesa.c	20 Dec 2003 00:28:21 -0000	1.1.4.3
@@ -1,5 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c,v 1.21 2003/12/02 13:02:38 alanh Exp $ */
 /* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c,v 1.22 2003/12/08 22:45:30 alanh Exp $ */
 /*
  * Copyright 2000-2001 VA Linux Systems, Inc.
  * All Rights Reserved.
@@ -537,12 +537,12 @@
           */
          int i;
 
-	 assert( is_empty_list( & mmesa->swapped ) );
-
          for ( i = 0 ; i < mmesa->nr_heaps ; i++ ) {
 	    driDestroyTextureHeap( mmesa->texture_heaps[ i ] );
 	    mmesa->texture_heaps[ i ] = NULL;
          }
+
+	 assert( is_empty_list( & mmesa->swapped ) );
       }
 
       FREE(mmesa);