From: Eric Anholt <eric@anholt.net>
Date: Fri, 19 Apr 2013 18:57:28 +0000 (-0700)
Subject: swrast: Reuse _swrast_free_texture_image_buffer from drivers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e7ecc11311d142a8ac919627011372a265224bcd;p=mesa.git

swrast: Reuse _swrast_free_texture_image_buffer from drivers.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

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);
 }
 
 /**