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.
This commit is contained in:
Alan Hourihane
2003-12-08 22:43:10 +00:00
parent 93c2dacca6
commit 73c3c397e4
6 changed files with 12 additions and 13 deletions
+2 -2
View File
@@ -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);
+2 -2
View File
@@ -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);
+2 -2
View File
@@ -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 */
+2 -2
View File
@@ -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 */
+2 -3
View File
@@ -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 */
+2 -2
View File
@@ -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 */