summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2011-09-25 11:48:00 +0100
committerJosé Fonseca <[email protected]>2011-09-25 12:18:55 +0100
commit6921d4cd57927da779b4ff773ba85cfb67c7f7f1 (patch)
tree2d61d588c25b84cd48195ae018e61a3f89e5dcc2 /src/gallium
parentf32c9c210875b2ce4878f97b84bdd4739bd489f9 (diff)
llvmpipe: Always use memory allocation macros.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_tile_image.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_tile_image.c b/src/gallium/drivers/llvmpipe/lp_tile_image.c
index 0938f7aea7e..4d53cdeef45 100644
--- a/src/gallium/drivers/llvmpipe/lp_tile_image.c
+++ b/src/gallium/drivers/llvmpipe/lp_tile_image.c
@@ -33,6 +33,7 @@
#include "util/u_format.h"
+#include "util/u_memory.h"
#include "lp_tile_soa.h"
#include "lp_tile_image.h"
@@ -313,7 +314,7 @@ test_tiled_linear_conversion(void *data,
unsigned wt = (width + TILE_SIZE - 1) / TILE_SIZE;
unsigned ht = (height + TILE_SIZE - 1) / TILE_SIZE;
- uint8_t *tiled = malloc(wt * ht * TILE_SIZE * TILE_SIZE * 4);
+ uint8_t *tiled = MALLOC(wt * ht * TILE_SIZE * TILE_SIZE * 4);
/*unsigned tiled_stride = wt * TILE_SIZE * TILE_SIZE * 4;*/
@@ -323,6 +324,6 @@ test_tiled_linear_conversion(void *data,
lp_tiled_to_linear(tiled, data, 0, 0, width, height, format,
stride, wt);
- free(tiled);
+ FREE(tiled);
}