summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2011-09-25 11:46:49 +0100
committerJosé Fonseca <[email protected]>2011-09-25 12:18:55 +0100
commitf32c9c210875b2ce4878f97b84bdd4739bd489f9 (patch)
tree805ef1caedbe5f5c63c92645f589c07f1d66b976 /src/gallium/drivers
parent1f23ac8082b51bc22000933919256e5a03fd073f (diff)
softpipe: Use memory allocation macros.
Fixes segfault with memory debugging on.
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/softpipe/sp_state_shader.c4
-rw-r--r--src/gallium/drivers/softpipe/sp_tex_sample.c2
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;