From f32c9c210875b2ce4878f97b84bdd4739bd489f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sun, 25 Sep 2011 11:46:49 +0100 Subject: [PATCH] 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 da895270aa9..d7d05990c07 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 dd33a10a1a6..2e91a709fe0 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; -- 2.30.2