From 76430815a73559c55e2061ceb2634406d1284f03 Mon Sep 17 00:00:00 2001 From: Michal Wajdeczko Date: Wed, 26 Mar 2008 13:33:34 -0700 Subject: [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_image.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/intel/intel_tex_image.c') diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index 3d2fc24357..dd8fbeaa91 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 " -- cgit v1.2.3