diff options
| author | Brian Paul <brianp@vmware.com> | 2011-10-23 10:44:47 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-10-23 10:44:47 -0600 |
| commit | 66681b4c8cb1ef16f42c1591298cb30c83bca09b (patch) | |
| tree | 77b33e0f70cdd24eb499fe5187a159f23ba7fa42 /src/mesa/drivers/dri/radeon/radeon_texture.c | |
| parent | 6e0f9001fe3fb191c2928bd09aa9e9d05ddf4ea9 (diff) | |
| download | external_mesa3d-66681b4c8cb1ef16f42c1591298cb30c83bca09b.zip external_mesa3d-66681b4c8cb1ef16f42c1591298cb30c83bca09b.tar.gz external_mesa3d-66681b4c8cb1ef16f42c1591298cb30c83bca09b.tar.bz2 | |
mesa: remove _mesa_alloc_texmemory(), _mesa_free_texmemory()
Core Mesa no longer does any texture memory allocation.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_texture.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index 2d17d30..abe7510 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -106,14 +106,14 @@ void radeonFreeTextureImageBuffer(struct gl_context *ctx, struct gl_texture_imag radeon_miptree_unreference(&image->mt); assert(!image->base.Data); } else { - _mesa_free_texture_image_data(ctx, timage); + _swrast_free_texture_image_buffer(ctx, timage); } if (image->bo) { radeon_bo_unref(image->bo); image->bo = NULL; } if (image->base.Data) { - _mesa_free_texmemory(image->base.Data); + _mesa_align_free(image->base.Data); image->base.Data = NULL; } @@ -828,7 +828,8 @@ static void radeon_teximage( texImage->Width, texImage->Height, texImage->Depth); - image->base.Data = _mesa_alloc_texmemory(size); + image->base.Data = _mesa_align_malloc(size, 512); + radeon_print(RADEON_TEXTURE, RADEON_VERBOSE, "%s %dd: texObj %p, texImage %p, " " no miptree assigned, using local memory %p\n", |