fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-07 14:48:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "dri/radeon: export a function to cleanup a texture object."

Browse source 
This reverts commit 5325f86240.
This commit is contained in:
Dave Airlie 2009-02-17 14:46:12 +10:00
parent 2ba4fc3d60
commit 7ce6af25e5
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/drivers/dri/common/texmem.c
View file

@ -314,10 +314,11 @@ void driSwapOutTextureObject( driTextureObject * t )
* \param t Texture object to be destroyed
*/
void driCleanupTextureObject( driTextureObject * t )
void driDestroyTextureObject( driTextureObject * t )
{
driTexHeap * heap;
if ( 0 ) {
fprintf( stderr, "[%s:%d] freeing %p (tObj = %p, DriverData = %p)\n",
__FILE__, __LINE__,
@ -349,6 +350,7 @@ void driCleanupTextureObject( driTextureObject * t )
}
remove_from_list( t );
FREE( t );
}
if ( 0 ) {
@ -357,18 +359,6 @@ void driCleanupTextureObject( driTextureObject * t )
}
void driDestroyTextureObject( driTextureObject * t )
{
driTexHeap * heap;
if (t == NULL)
return;
driCleanupTextureObject(t);
FREE(t);
}
/**

1
src/mesa/drivers/dri/common/texmem.h
View file

@ -272,7 +272,6 @@ void driAgeTextures( driTexHeap * heap );
void driUpdateTextureLRU( driTextureObject * t );
void driSwapOutTextureObject( driTextureObject * t );
void driCleanupTextureObject( driTextureObject * t );
void driDestroyTextureObject( driTextureObject * t );
int driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps,
driTextureObject * t );

4
src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
View file

@ -377,13 +377,11 @@ static void bo_free(struct bo_legacy *bo_legacy)
/* dma buffers */
bo_dma_free(&bo_legacy->base);
} else {
if (bo_legacy->got_dri_texture_obj)
driCleanupTextureObject(&bo_legacy->dri_texture_obj);
/* free backing store */
free(bo_legacy->ptr);
}
}
memset(bo_legacy, 0 , sizeof(struct bo_legacy));
free(bo_legacy);
}