From e7ecc11311d142a8ac919627011372a265224bcd Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 19 Apr 2013 11:57:28 -0700 Subject: [PATCH] swrast: Reuse _swrast_free_texture_image_buffer from drivers. Reviewed-by: Kenneth Graunke Reviewed-by: Brian Paul --- src/mesa/drivers/dri/intel/intel_tex.c | 8 +------- src/mesa/drivers/dri/radeon/radeon_texture.c | 9 +-------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c index 2fbd5c4e815..24f13dfee89 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.c +++ b/src/mesa/drivers/dri/intel/intel_tex.c @@ -121,13 +121,7 @@ intel_free_texture_image_buffer(struct gl_context * ctx, intel_miptree_release(&intelImage->mt); - if (intelImage->base.Buffer) { - _mesa_align_free(intelImage->base.Buffer); - intelImage->base.Buffer = NULL; - } - - free(intelImage->base.ImageOffsets); - intelImage->base.ImageOffsets = NULL; + _swrast_free_texture_image_buffer(ctx, texImage); } /** diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index a953858d3bb..23942cbb0a0 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -127,20 +127,13 @@ void radeonFreeTextureImageBuffer(struct gl_context *ctx, struct gl_texture_imag if (image->mt) { radeon_miptree_unreference(&image->mt); - } else { - _swrast_free_texture_image_buffer(ctx, timage); } if (image->bo) { radeon_bo_unref(image->bo); image->bo = NULL; } - if (image->base.Buffer) { - _mesa_align_free(image->base.Buffer); - image->base.Buffer = NULL; - } - free(image->base.ImageOffsets); - image->base.ImageOffsets = NULL; + _swrast_free_texture_image_buffer(ctx, timage); } /** -- 2.30.2