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:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user