fix bogus assertion that checked for an empty texture heap list before

deleting the textures. Essentially move the assertion after the destruction
of the heap.

diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index 3bf0a81bcbb0b1b2204be5d06adb9e0106cc8c5f..868ae028ef37839fd6b623ccde5e5828026a0ac5 100644 (file)
--- a/src/mesa/drivers/dri/i810/i810context.c
+++ b/src/mesa/drivers/dri/i810/i810context.c
@@ -320,12 +320,12 @@ i810DestroyContext(__DRIcontextPrivate *driContextPriv)
           */
          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);

diff --git a/src/mesa/drivers/dri/i830/i830_context.c b/src/mesa/drivers/dri/i830/i830_context.c
index 9eaff1eed731ffa9b243592410ead15d3c088244..1d1890976f065d62b5c276273be452b32da8da55 100644 (file)
--- a/src/mesa/drivers/dri/i830/i830_context.c
+++ b/src/mesa/drivers/dri/i830/i830_context.c
@@ -410,12 +410,12 @@ void i830DestroyContext(__DRIcontextPrivate *driContextPriv)
           */
          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);

diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index 3752a8b13c0167dec2133effbe88205180cf405c..3888d12cb91a6a089dd6d2afaa4878db123d56c4 100644 (file)
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -573,12 +573,12 @@ mgaDestroyContext(__DRIcontextPrivate *driContextPriv)
           */
          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 the option cache */

diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c
index 1c7e868ad1fd33ac216875f1cd6501f3a8304aef..72906155072e3b2bf11518714e0aad001ac54297 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_context.c
+++ b/src/mesa/drivers/dri/r128/r128_context.c
@@ -300,12 +300,12 @@ void r128DestroyContext( __DRIcontextPrivate *driContextPriv  )
           */
          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 the option cache */

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index c08c411e22dc93de250f32f0525528599fd628a2..2da6ef3abb162e5adec9f6b17fc2f15d31851af1 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -530,13 +530,12 @@ void r200DestroyContext( __DRIcontextPrivate *driContextPriv )
           */
          int i;
 
-        /* this assert is wrong. The default textures are always on swap list
-        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 the option cache */

diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 2cd09b187067dc4072f2261c0a1d8e1b7a6bcfbf..0abf5b2e3e718dee6904f06e70e9887d38f7c25a 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -526,12 +526,12 @@ void radeonDestroyContext( __DRIcontextPrivate *driContextPriv )
           */
          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 the option cache */