From 559c494fc8b4cc8b058a2f2046ce492d0294e51e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 1 Jul 2005 02:03:00 +0000 Subject: [PATCH] replace some free() calls with _mesa_free() --- src/mesa/tnl/t_vb_arbprogram.c | 9 +++++---- src/mesa/tnl/t_vb_arbprogram_sse.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c index d166602d8ea..96311ff17ba 100644 --- a/src/mesa/tnl/t_vb_arbprogram.c +++ b/src/mesa/tnl/t_vb_arbprogram.c @@ -1004,8 +1004,9 @@ static void cvp_emit_inst( struct compilation *cp, static void free_tnl_data( struct vertex_program *program ) { struct tnl_compiled_program *p = program->TnlData; - if (p->compiled_func) free((void *)p->compiled_func); - free(p); + if (p->compiled_func) + _mesa_free((void *)p->compiled_func); + _mesa_free(p); program->TnlData = NULL; } @@ -1369,7 +1370,7 @@ static GLboolean init_vertex_program( GLcontext *ctx, const GLuint size = VB->Size; GLuint i; - stage->privatePtr = MALLOC(sizeof(*m)); + stage->privatePtr = _mesa_malloc(sizeof(*m)); m = ARB_VP_MACHINE(stage); if (!m) return GL_FALSE; @@ -1422,7 +1423,7 @@ static void dtr( struct tnl_pipeline_stage *stage ) ALIGN_FREE( m->clipmask ); ALIGN_FREE( m->File[0] ); - FREE( m ); + _mesa_free( m ); stage->privatePtr = NULL; } } diff --git a/src/mesa/tnl/t_vb_arbprogram_sse.c b/src/mesa/tnl/t_vb_arbprogram_sse.c index b6ffdda7d3a..bfe45912a77 100644 --- a/src/mesa/tnl/t_vb_arbprogram_sse.c +++ b/src/mesa/tnl/t_vb_arbprogram_sse.c @@ -851,7 +851,7 @@ _tnl_sse_codegen_vertex_program(struct tnl_compiled_program *p) cp.have_sse2 = 1; if (p->compiled_func) { - free((void *)p->compiled_func); + _mesa_free((void *)p->compiled_func); p->compiled_func = NULL; } -- 2.11.0