Module: Mesa
Branch: master
Commit: f32c9c210875b2ce4878f97b84bdd4739bd489f9
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f32c9c210875b2ce4878f97b84bdd4739bd489f9
Author: José Fonseca <jose.r.fons...@gmail.com>
Date: Sun Sep 25 11:46:49 2011 +0100
softpipe: Use memory allocation macros.
Fixes segfault with memory debugging on.
---
src/gallium/drivers/softpipe/sp_state_shader.c | 4 ++--
src/gallium/drivers/softpipe/sp_tex_sample.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/softpipe/sp_state_shader.c
b/src/gallium/drivers/softpipe/sp_state_shader.c
index da89527..d7d0599 100644
--- a/src/gallium/drivers/softpipe/sp_state_shader.c
+++ b/src/gallium/drivers/softpipe/sp_state_shader.c
@@ -93,8 +93,8 @@ create_fs_variant(struct softpipe_context *softpipe,
}
if (stipple_fs) {
- free((void *) stipple_fs->tokens);
- free(stipple_fs);
+ FREE((void *) stipple_fs->tokens);
+ FREE(stipple_fs);
}
return var;
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c
b/src/gallium/drivers/softpipe/sp_tex_sample.c
index dd33a10..2e91a70 100644
--- a/src/gallium/drivers/softpipe/sp_tex_sample.c
+++ b/src/gallium/drivers/softpipe/sp_tex_sample.c
@@ -1722,7 +1722,7 @@ create_filter_table(void)
{
unsigned i;
if (!weightLut) {
- weightLut = (float *) malloc(WEIGHT_LUT_SIZE * sizeof(float));
+ weightLut = (float *) MALLOC(WEIGHT_LUT_SIZE * sizeof(float));
for (i = 0; i < WEIGHT_LUT_SIZE; ++i) {
float alpha = 2;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
