nv30: use FREE macro

diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c
index 1e729d789bd4ef1ed8b60400df2d0ea7e6117c47..b8e8b86d99ab713be53616f384df7388270bedd4 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_context.c
+++ b/src/gallium/drivers/nv30/nv30_context.c
@@ -41,7 +41,7 @@ nv30_destroy(struct pipe_context *pipe)
 
        nvws->grobj_free(&nv30->rankine);
 
-       free(nv30);
+       FREE(nv30);
 }
 
 static boolean

diff --git a/src/gallium/drivers/nv30/nv30_draw.c b/src/gallium/drivers/nv30/nv30_draw.c
index 59a72657996bc45a837f7c9d82fa41797f6456fa..8ec0835225bcb10ec1ce0e7d729d79278efe2e46 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_draw.c
+++ b/src/gallium/drivers/nv30/nv30_draw.c
@@ -40,7 +40,7 @@ nv30_draw_reset_stipple_counter(struct draw_stage *draw)
 static void
 nv30_draw_destroy(struct draw_stage *draw)
 {
-       free(draw);
+       FREE(draw);
 }
 
 struct draw_stage *

diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c
index 6f61d36f4e8a09f193dff7cac2b6356edebbf818..51000bd6fcdfba186803837781876eb9501c0c6f 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_fragprog.c
+++ b/src/gallium/drivers/nv30/nv30_fragprog.c
@@ -753,7 +753,7 @@ nv30_fragprog_translate(struct nv30_context *nv30,
        fp->on_hw = FALSE;
 out_err:
        tgsi_parse_free(&parse);
-       free(fpc);
+       FREE(fpc);
 }
 
 void
@@ -829,6 +829,6 @@ nv30_fragprog_destroy(struct nv30_context *nv30,
                      struct nv30_fragment_program *fp)
 {
        if (fp->insn_len)
-               free(fp->insn);
+               FREE(fp->insn);
 }
 

diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index 6fdcf42a243f337d4c26957947d3bad4ef1ceb6c..afb05fdd2bfd3eb422e0ed481fd4110c55eec945 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
@@ -72,7 +72,7 @@ nv30_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
        mt->buffer = ws->buffer_create(ws, 256, PIPE_BUFFER_USAGE_PIXEL,
                                           mt->total_size);
        if (!mt->buffer) {
-               free(mt);
+               FREE(mt);
                return NULL;
        }
        
@@ -93,9 +93,9 @@ nv30_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
                pipe_buffer_reference(ws, &nv30mt->buffer, NULL);
                for (l = 0; l <= mt->last_level; l++) {
                        if (nv30mt->level[l].image_offset)
-                               free(nv30mt->level[l].image_offset);
+                               FREE(nv30mt->level[l].image_offset);
                }
-               free(nv30mt);
+               FREE(nv30mt);
        }
 }
 

diff --git a/src/gallium/drivers/nv30/nv30_query.c b/src/gallium/drivers/nv30/nv30_query.c
index e19cb455dceb5381240615230126dfd38b405f1e..0c2d941562cd0a7fdd5df318b6846933beddf3d6 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_query.c
+++ b/src/gallium/drivers/nv30/nv30_query.c
@@ -35,7 +35,7 @@ nv30_query_destroy(struct pipe_context *pipe, struct pipe_query *pq)
 
        if (q->object)
                nv30->nvws->res_free(&q->object);
-       free(q);
+       FREE(q);
 }
 
 static void

diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 983638adccbb1f4db6b54fbefddd85ac436c29ad..620038fa64712557c39f4575a7b8f085f247af5d 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -486,7 +486,7 @@ nv30_vp_state_delete(struct pipe_context *pipe, void *hwcso)
        struct nv30_vertex_program *vp = hwcso;
 
        nv30_vertprog_destroy(nv30, vp);
-       free(vp);
+       FREE(vp);
 }
 
 static void *
@@ -522,7 +522,7 @@ nv30_fp_state_delete(struct pipe_context *pipe, void *hwcso)
        struct nv30_fragment_program *fp = hwcso;
 
        nv30_fragprog_destroy(nv30, fp);
-       free(fp);
+       FREE(fp);
 }
 
 static void

diff --git a/src/gallium/drivers/nv30/nv30_vertprog.c b/src/gallium/drivers/nv30/nv30_vertprog.c
index e9b62ff48b43744ade91d56069173b4f72e8e5e2..fe1a467565d9822722ae84cac4081b514647e4a8 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_vertprog.c
+++ b/src/gallium/drivers/nv30/nv30_vertprog.c
@@ -578,7 +578,7 @@ nv30_vertprog_translate(struct nv30_context *nv30,
        vpc->high_temp = -1;
 
        if (!nv30_vertprog_prepare(vpc)) {
-               free(vpc);
+               FREE(vpc);
                return;
        }
 
@@ -634,7 +634,7 @@ nv30_vertprog_translate(struct nv30_context *nv30,
        vp->translated = TRUE;
 out_err:
        tgsi_parse_free(&parse);
-       free(vpc);
+       FREE(vpc);
 }
 
 void
@@ -790,8 +790,8 @@ void
 nv30_vertprog_destroy(struct nv30_context *nv30, struct nv30_vertex_program *vp)
 {
        if (vp->nr_consts)
-               free(vp->consts);
+               FREE(vp->consts);
        if (vp->nr_insns)
-               free(vp->insns);
+               FREE(vp->insns);
 }