Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	progs/trivial/tri.c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index acaf1de8823..d08229b57a3 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -156,7 +156,7 @@ st_FreeTextureImageData(GLcontext * ctx, struct gl_texture_image *texImage)
    }
 
    if (texImage->Data) {
-      free(texImage->Data);
+      _mesa_align_free(texImage->Data);
       texImage->Data = NULL;
    }
 }
@@ -541,7 +541,7 @@ st_TexImage(GLcontext * ctx,
          sizeInBytes = depth * dstRowStride * postConvHeight;
       }
 
-      texImage->Data = malloc(sizeInBytes);
+      texImage->Data = _mesa_align_malloc(sizeInBytes, 16);
    }
 
    if (!texImage->Data) {