KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[intel] Use mesa texmemory functions to allocate teximage Data. 

Failure to consistently do so resulted in mismatched aligned versus
unaligned alloc/free.
This commit is contained in:
Michal Wajdeczko 2008-03-26 13:33:34 -07:00 committed by Eric Anholt
parent b4cbf6983e
commit 76430815a7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/drivers/dri/intel/intel_tex.c
View File

@ -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;
}
}

5
src/mesa/drivers/dri/intel/intel_tex_image.c
View File

@ -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 "