From 76430815a73559c55e2061ceb2634406d1284f03 Mon Sep 17 00:00:00 2001
From: Michal Wajdeczko <Michal.Wajdeczko@intel.com>
Date: Wed, 26 Mar 2008 13:33:34 -0700
Subject: [PATCH] [intel] Use mesa texmemory functions to allocate teximage
 Data.

Failure to consistently do so resulted in mismatched aligned versus
unaligned alloc/free.
---
 src/mesa/drivers/dri/intel/intel_tex.c       | 3 ++-
 src/mesa/drivers/dri/intel/intel_tex_image.c | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c
index c110df478f2..329af0d1b04 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.c
+++ b/src/mesa/drivers/dri/intel/intel_tex.c
@@ -1,5 +1,6 @@
 #include "swrast/swrast.h"
 #include "texobj.h"
+#include "teximage.h"
 #include "mipmap.h"
 #include "intel_context.h"
 #include "intel_mipmap_tree.h"
@@ -71,7 +72,7 @@ intelFreeTextureImageData(GLcontext * ctx, struct gl_texture_image *texImage)
    }
 
    if (texImage->Data) {
-      free(texImage->Data);
+      _mesa_free_texmemory(texImage->Data);
       texImage->Data = NULL;
    }
 }
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 3d2fc243575..dd8fbeaa911 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -360,7 +360,8 @@ intelTexImage(GLcontext * ctx,
       assert(!texImage->Data);
    }
    else if (texImage->Data) {
-      _mesa_align_free(texImage->Data);
+      _mesa_free_texmemory(texImage->Data);
+      texImage->Data = NULL;
    }
 
    /* If this is the only texture image in the tree, could call
@@ -481,7 +482,7 @@ intelTexImage(GLcontext * ctx,
          sizeInBytes = depth * dstRowStride * postConvHeight;
       }
 
-      texImage->Data = malloc(sizeInBytes);
+      texImage->Data = _mesa_alloc_texmemory(sizeInBytes);
    }
 
    DBG("Upload image %dx%dx%d row_len %d "
-- 
2.30.2