Mesa (master): llvmpipe: Portability fixes.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Apr 22 18:25:15 UTC 2010
Module: Mesa
Branch: master
Commit: cdaceaafee01867d289c2b72fed9c7a200a9e350
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cdaceaafee01867d289c2b72fed9c7a200a9e350
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Apr 22 19:24:30 2010 +0100
llvmpipe: Portability fixes.
---
src/gallium/drivers/llvmpipe/lp_rast.c | 4 ++--
src/gallium/drivers/llvmpipe/lp_texture.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c
index 4046701..0a41b64 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast.c
@@ -123,8 +123,8 @@ lp_rast_end( struct lp_rasterizer *rast )
rast->curr_scene = NULL;
if (0)
- printf("Post render scene: tile read: %d tile write: %d\n",
- tile_read_count, tile_write_count);
+ debug_printf("Post render scene: tile read: %d tile write: %d\n",
+ tile_read_count, tile_write_count);
}
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index f766ab2..336b487 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -85,7 +85,7 @@ alloc_layout_array(unsigned num_slices, unsigned width, unsigned height)
assert(LP_TEX_LAYOUT_NONE == 0); /* calloc'ing LP_TEX_LAYOUT_NONE here */
return (enum lp_texture_layout *)
- calloc(num_slices * tx * ty, sizeof(enum lp_texture_layout));
+ CALLOC(num_slices * tx * ty, sizeof(enum lp_texture_layout));
}
@@ -265,7 +265,7 @@ llvmpipe_resource_destroy(struct pipe_screen *pscreen,
/* free layout flag arrays */
for (level = 0; level < Elements(lpr->tiled); level++) {
- free(lpr->layout[level]);
+ FREE(lpr->layout[level]);
lpr->layout[level] = NULL;
}
}
More information about the mesa-commit
mailing list