aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/tnl
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/src/mesa/tnl')
-rw-r--r--mesalib/src/mesa/tnl/t_context.c4
-rw-r--r--mesalib/src/mesa/tnl/t_vb_fog.c4
-rw-r--r--mesalib/src/mesa/tnl/t_vb_light.c4
-rw-r--r--mesalib/src/mesa/tnl/t_vb_program.c4
-rw-r--r--mesalib/src/mesa/tnl/t_vb_texgen.c12
-rw-r--r--mesalib/src/mesa/tnl/t_vb_texmat.c4
-rw-r--r--mesalib/src/mesa/tnl/t_vb_vertex.c4
-rw-r--r--mesalib/src/mesa/tnl/t_vertex.c4
8 files changed, 20 insertions, 20 deletions
diff --git a/mesalib/src/mesa/tnl/t_context.c b/mesalib/src/mesa/tnl/t_context.c
index dbda7a5fc..aa6783932 100644
--- a/mesalib/src/mesa/tnl/t_context.c
+++ b/mesalib/src/mesa/tnl/t_context.c
@@ -50,7 +50,7 @@ _tnl_CreateContext( struct gl_context *ctx )
/* Create the TNLcontext structure
*/
- ctx->swtnl_context = tnl = (TNLcontext *) CALLOC( sizeof(TNLcontext) );
+ ctx->swtnl_context = tnl = (TNLcontext *) calloc(1, sizeof(TNLcontext));
if (!tnl) {
return GL_FALSE;
@@ -116,7 +116,7 @@ _tnl_DestroyContext( struct gl_context *ctx )
_tnl_destroy_pipeline( ctx );
- FREE(tnl);
+ free(tnl);
ctx->swtnl_context = NULL;
}
diff --git a/mesalib/src/mesa/tnl/t_vb_fog.c b/mesalib/src/mesa/tnl/t_vb_fog.c
index cbd8dfc96..134cae1c7 100644
--- a/mesalib/src/mesa/tnl/t_vb_fog.c
+++ b/mesalib/src/mesa/tnl/t_vb_fog.c
@@ -239,7 +239,7 @@ alloc_fog_data(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct fog_stage_data *store;
- stage->privatePtr = MALLOC(sizeof(*store));
+ stage->privatePtr = malloc(sizeof(*store));
store = FOG_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
@@ -259,7 +259,7 @@ free_fog_data(struct tnl_pipeline_stage *stage)
struct fog_stage_data *store = FOG_STAGE_DATA(stage);
if (store) {
_mesa_vector4f_free( &store->fogcoord );
- FREE( store );
+ free( store );
stage->privatePtr = NULL;
}
}
diff --git a/mesalib/src/mesa/tnl/t_vb_light.c b/mesalib/src/mesa/tnl/t_vb_light.c
index 854887c8f..39ba49685 100644
--- a/mesalib/src/mesa/tnl/t_vb_light.c
+++ b/mesalib/src/mesa/tnl/t_vb_light.c
@@ -421,7 +421,7 @@ static GLboolean init_lighting( struct gl_context *ctx,
struct light_stage_data *store;
GLuint size = tnl->vb.Size;
- stage->privatePtr = MALLOC(sizeof(*store));
+ stage->privatePtr = malloc(sizeof(*store));
store = LIGHT_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
@@ -457,7 +457,7 @@ static void dtr( struct tnl_pipeline_stage *stage )
_mesa_vector4f_free( &store->LitColor[1] );
_mesa_vector4f_free( &store->LitSecondary[0] );
_mesa_vector4f_free( &store->LitSecondary[1] );
- FREE( store );
+ free( store );
stage->privatePtr = NULL;
}
}
diff --git a/mesalib/src/mesa/tnl/t_vb_program.c b/mesalib/src/mesa/tnl/t_vb_program.c
index 74772dbbe..271137f87 100644
--- a/mesalib/src/mesa/tnl/t_vb_program.c
+++ b/mesalib/src/mesa/tnl/t_vb_program.c
@@ -514,7 +514,7 @@ init_vp(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
struct vp_stage_data *store;
const GLuint size = VB->Size;
- stage->privatePtr = CALLOC(sizeof(*store));
+ stage->privatePtr = calloc(1, sizeof(*store));
store = VP_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
@@ -546,7 +546,7 @@ dtr(struct tnl_pipeline_stage *stage)
_mesa_vector4f_free( &store->ndcCoords );
_mesa_align_free( store->clipmask );
- FREE( store );
+ free( store );
stage->privatePtr = NULL;
}
}
diff --git a/mesalib/src/mesa/tnl/t_vb_texgen.c b/mesalib/src/mesa/tnl/t_vb_texgen.c
index d4c788523..c757ac522 100644
--- a/mesalib/src/mesa/tnl/t_vb_texgen.c
+++ b/mesalib/src/mesa/tnl/t_vb_texgen.c
@@ -562,7 +562,7 @@ static GLboolean alloc_texgen_data( struct gl_context *ctx,
struct texgen_stage_data *store;
GLuint i;
- stage->privatePtr = CALLOC(sizeof(*store));
+ stage->privatePtr = calloc(1, sizeof(*store));
store = TEXGEN_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
@@ -570,8 +570,8 @@ static GLboolean alloc_texgen_data( struct gl_context *ctx,
for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
_mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
- store->tmp_f = (GLfloat (*)[3]) MALLOC(VB->Size * sizeof(GLfloat) * 3);
- store->tmp_m = (GLfloat *) MALLOC(VB->Size * sizeof(GLfloat));
+ store->tmp_f = (GLfloat (*)[3]) malloc(VB->Size * sizeof(GLfloat) * 3);
+ store->tmp_m = (GLfloat *) malloc(VB->Size * sizeof(GLfloat));
return GL_TRUE;
}
@@ -589,9 +589,9 @@ static void free_texgen_data( struct tnl_pipeline_stage *stage )
_mesa_vector4f_free( &store->texcoord[i] );
- if (store->tmp_f) FREE( store->tmp_f );
- if (store->tmp_m) FREE( store->tmp_m );
- FREE( store );
+ if (store->tmp_f) free( store->tmp_f );
+ if (store->tmp_m) free( store->tmp_m );
+ free( store );
stage->privatePtr = NULL;
}
}
diff --git a/mesalib/src/mesa/tnl/t_vb_texmat.c b/mesalib/src/mesa/tnl/t_vb_texmat.c
index 38aa51fc4..91bb0f797 100644
--- a/mesalib/src/mesa/tnl/t_vb_texmat.c
+++ b/mesalib/src/mesa/tnl/t_vb_texmat.c
@@ -89,7 +89,7 @@ static GLboolean alloc_texmat_data( struct gl_context *ctx,
struct texmat_stage_data *store;
GLuint i;
- stage->privatePtr = CALLOC(sizeof(*store));
+ stage->privatePtr = calloc(1, sizeof(*store));
store = TEXMAT_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
@@ -110,7 +110,7 @@ static void free_texmat_data( struct tnl_pipeline_stage *stage )
for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
if (store->texcoord[i].data)
_mesa_vector4f_free( &store->texcoord[i] );
- FREE( store );
+ free( store );
stage->privatePtr = NULL;
}
}
diff --git a/mesalib/src/mesa/tnl/t_vb_vertex.c b/mesalib/src/mesa/tnl/t_vb_vertex.c
index 26e8ae065..64795a57e 100644
--- a/mesalib/src/mesa/tnl/t_vb_vertex.c
+++ b/mesalib/src/mesa/tnl/t_vb_vertex.c
@@ -236,7 +236,7 @@ static GLboolean init_vertex_stage( struct gl_context *ctx,
struct vertex_stage_data *store;
GLuint size = VB->Size;
- stage->privatePtr = CALLOC(sizeof(*store));
+ stage->privatePtr = calloc(1, sizeof(*store));
store = VERTEX_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
@@ -265,7 +265,7 @@ static void dtr( struct tnl_pipeline_stage *stage )
_mesa_vector4f_free( &store->clip );
_mesa_vector4f_free( &store->proj );
_mesa_align_free( store->clipmask );
- FREE(store);
+ free(store);
stage->privatePtr = NULL;
stage->run = init_vertex_stage;
}
diff --git a/mesalib/src/mesa/tnl/t_vertex.c b/mesalib/src/mesa/tnl/t_vertex.c
index 580f95df3..7e83d454d 100644
--- a/mesalib/src/mesa/tnl/t_vertex.c
+++ b/mesalib/src/mesa/tnl/t_vertex.c
@@ -548,7 +548,7 @@ void _tnl_free_vertices( struct gl_context *ctx )
for (fp = vtx->fastpath ; fp ; fp = tmp) {
tmp = fp->next;
- FREE(fp->attr);
+ free(fp->attr);
/* KW: At the moment, fp->func is constrained to be allocated by
* _mesa_exec_alloc(), as the hardwired fastpaths in
@@ -557,7 +557,7 @@ void _tnl_free_vertices( struct gl_context *ctx )
* module gets another overhaul.
*/
_mesa_exec_free((void *) fp->func);
- FREE(fp);
+ free(fp);
}
vtx->fastpath = NULL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 02:42:52 +0000