fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-13 09:00:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeon/r200: drop legacy texture heap code

Browse source
This commit is contained in:
Dave Airlie 2009-02-17 14:00:24 +10:00
parent 48e7b940eb
commit 2ba4fc3d60
3 changed files with 0 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/mesa/drivers/dri/r200/r200_context.c
View file

@ -331,25 +331,6 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
return GL_FALSE;
}
(void) memset( rmesa->radeon.texture_heaps, 0, sizeof( rmesa->radeon.texture_heaps ) );
make_empty_list( & rmesa->radeon.swapped );
rmesa->radeon.nr_heaps = 1 /* screen->numTexHeaps */ ;
assert(rmesa->radeon.nr_heaps < RADEON_NR_TEX_HEAPS);
#if 0
for ( i = 0 ; i < rmesa->radeon.nr_heaps ; i++ ) {
rmesa->radeon.texture_heaps[i] = driCreateTextureHeap( i, rmesa,
screen->texSize[i],
12,
RADEON_NR_TEX_REGIONS,
(drmTextureRegionPtr)rmesa->radeon.sarea->tex_list[i],
& rmesa->radeon.sarea->tex_age[i],
& rmesa->radeon.swapped,
sizeof( radeonTexObj ),
(destroy_texture_object_t *) r200DestroyTexObj );
}
#endif
rmesa->radeon.texture_depth = driQueryOptioni (&rmesa->radeon.optionCache,
"texture_depth");
if (rmesa->radeon.texture_depth == DRI_CONF_TEXTURE_DEPTH_FB)
@ -373,22 +354,6 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
i = driQueryOptioni( &rmesa->radeon.optionCache, "allow_large_textures");
driCalculateMaxTextureLevels( rmesa->radeon.texture_heaps,
rmesa->radeon.nr_heaps,
& ctx->Const,
4,
11, /* max 2D texture size is 2048x2048 */
#if ENABLE_HW_3D_TEXTURE
8, /* max 3D texture size is 256^3 */
#else
0, /* 3D textures unsupported */
#endif
11, /* max cube texture size is 2048x2048 */
11, /* max texture rectangle size is 2048x2048 */
12,
GL_FALSE,
i );
ctx->Const.MaxTextureMaxAnisotropy = 16.0;
/* No wide AA points.
@ -541,10 +506,7 @@ void r200DestroyContext( __DRIcontextPrivate *driContextPriv )
/* Free r200 context resources */
assert(rmesa); /* should never be null */
if ( rmesa ) {
GLboolean release_texture_heaps;
release_texture_heaps = (rmesa->radeon.glCtx->Shared->RefCount == 1);
_swsetup_DestroyContext( rmesa->radeon.glCtx );
_tnl_DestroyContext( rmesa->radeon.glCtx );
_vbo_DestroyContext( rmesa->radeon.glCtx );
@ -563,21 +525,6 @@ void r200DestroyContext( __DRIcontextPrivate *driContextPriv )
rmesa->radeon.state.scissor.pClipRects = NULL;
}
if ( release_texture_heaps ) {
/* This share group is about to go away, free our private
* texture object data.
*/
int i;
for ( i = 0 ; i < rmesa->radeon.nr_heaps ; i++ ) {
driDestroyTextureHeap( rmesa->radeon.texture_heaps[ i ] );
rmesa->radeon.texture_heaps[ i ] = NULL;
}
assert( is_empty_list( & rmesa->radeon.swapped ) );
}
radeonCleanupContext(&rmesa->radeon);
FREE( rmesa );

3
src/mesa/drivers/dri/radeon/radeon_common_context.h
View file

@ -375,9 +375,6 @@ struct radeon_context {
/* Texture object bookkeeping
*/
unsigned nr_heaps;
driTexHeap * texture_heaps[ RADEON_NR_TEX_HEAPS ];
driTextureObject swapped;
int texture_depth;
float initialMaxAnisotropy;

51
src/mesa/drivers/dri/radeon/radeon_context.c
View file

@ -161,7 +161,6 @@ static void r100_get_lock(radeonContextPtr radeon)
}
if (sarea->ctx_owner != rmesa->radeon.dri.hwContext) {
int i;
sarea->ctx_owner = rmesa->radeon.dri.hwContext;
if (!radeon->radeonScreen->kernel_mm)
@ -255,26 +254,6 @@ radeonCreateContext( const __GLcontextModes *glVisual,
return GL_FALSE;
}
(void) memset( rmesa->radeon.texture_heaps, 0, sizeof( rmesa->radeon.texture_heaps ) );
make_empty_list( & rmesa->radeon.swapped );
#if 0
rmesa->radeon.nr_heaps = screen->numTexHeaps;
for ( i = 0 ; i < rmesa->radeon.nr_heaps ; i++ ) {
rmesa->radeon.texture_heaps[i] = driCreateTextureHeap( i, rmesa,
screen->texSize[i],
12,
RADEON_NR_TEX_REGIONS,
(drmTextureRegionPtr)rmesa->radeon.sarea->tex_list[i],
& rmesa->radeon.sarea->tex_age[i],
& rmesa->radeon.swapped,
sizeof( radeonTexObj ),
(destroy_texture_object_t *) radeonDestroyTexObj );
driSetTextureSwapCounterLocation( rmesa->radeon.texture_heaps[i],
& rmesa->c_textureSwaps );
}
#endif
rmesa->radeon.texture_depth = driQueryOptioni (&rmesa->radeon.optionCache,
"texture_depth");
if (rmesa->radeon.texture_depth == DRI_CONF_TEXTURE_DEPTH_FB)
@ -298,19 +277,6 @@ radeonCreateContext( const __GLcontextModes *glVisual,
i = driQueryOptioni( &rmesa->radeon.optionCache, "allow_large_textures");
driCalculateMaxTextureLevels( rmesa->radeon.texture_heaps,
rmesa->radeon.nr_heaps,
& ctx->Const,
4,
11, /* max 2D texture size is 2048x2048 */
8, /* 256^3 */
9, /* \todo: max cube texture size seems to be 512x512(x6) */
11, /* max rect texture size is 2048x2048. */
12,
GL_FALSE,
i );
ctx->Const.MaxTextureMaxAnisotropy = 16.0;
/* No wide points.
@ -450,10 +416,7 @@ void radeonDestroyContext( __DRIcontextPrivate *driContextPriv )
/* Free radeon context resources */
assert(rmesa); /* should never be null */
if ( rmesa ) {
GLboolean release_texture_heaps;
release_texture_heaps = (rmesa->radeon.glCtx->Shared->RefCount == 1);
_swsetup_DestroyContext( rmesa->radeon.glCtx );
_tnl_DestroyContext( rmesa->radeon.glCtx );
_vbo_DestroyContext( rmesa->radeon.glCtx );
@ -473,20 +436,6 @@ void radeonDestroyContext( __DRIcontextPrivate *driContextPriv )
rmesa->radeon.state.scissor.pClipRects = NULL;
}
if ( release_texture_heaps ) {
/* This share group is about to go away, free our private
* texture object data.
*/
int i;
for ( i = 0 ; i < rmesa->radeon.nr_heaps ; i++ ) {
driDestroyTextureHeap( rmesa->radeon.texture_heaps[ i ] );
rmesa->radeon.texture_heaps[ i ] = NULL;
}
assert( is_empty_list( & rmesa->radeon.swapped ) );
}
radeonCleanupContext(&rmesa->radeon);
FREE( rmesa );