@@ -41,7 +41,7 @@ nv30_destroy(struct pipe_context *pipe) | |||
nvws->grobj_free(&nv30->rankine); | |||
free(nv30); | |||
FREE(nv30); | |||
} | |||
static boolean |
@@ -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 * |
@@ -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); | |||
} | |||
@@ -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); | |||
} | |||
} | |||
@@ -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 |
@@ -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 |
@@ -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); | |||
} | |||