summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/api_arrayelt.c2
-rw-r--r--src/mesa/main/attrib.c8
-rw-r--r--src/mesa/main/errors.c4
-rw-r--r--src/mesa/main/eval.c44
-rw-r--r--src/mesa/main/matrix.c2
-rw-r--r--src/mesa/main/samplerobj.c2
6 files changed, 31 insertions, 31 deletions
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 8f268a6..152340b 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -1438,7 +1438,7 @@ GLboolean _ae_create_context( struct gl_context *ctx )
void _ae_destroy_context( struct gl_context *ctx )
{
if ( AE_CONTEXT( ctx ) ) {
- FREE( ctx->aelt_context );
+ free(ctx->aelt_context);
ctx->aelt_context = NULL;
}
}
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 6b0a76a..b3d10d3 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1314,8 +1314,8 @@ _mesa_PopAttrib(void)
}
next = attr->next;
- FREE( attr->data );
- FREE( attr );
+ free(attr->data);
+ free(attr);
attr = next;
}
}
@@ -1592,8 +1592,8 @@ _mesa_PopClientAttrib(void)
}
next = node->next;
- FREE( node->data );
- FREE( node );
+ free(node->data);
+ free(node);
node = next;
}
}
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 950cc4f..796b6be 100644
--- a/src/mesa/main/errors.c
+++ b/src/mesa/main/errors.c
@@ -391,7 +391,7 @@ _mesa_get_msg(struct gl_context *ctx, GLenum *source, GLenum *type,
}
if (msg->message != (char*)out_of_memory)
- FREE(msg->message);
+ free(msg->message);
msg->message = NULL;
msg->length = 0;
@@ -786,7 +786,7 @@ _mesa_free_errors_data(struct gl_context *ctx)
foreach_s(node, tmp, &ClientIDs->Namespaces[s][t].Severity[sev]) {
entry = (struct gl_client_severity *)node;
- FREE(entry);
+ free(entry);
}
}
}
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index 348b7ac..0ae349f 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -416,7 +416,7 @@ map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
map->u2 = u2;
map->du = 1.0F / (u2 - u1);
if (map->Points)
- FREE( map->Points );
+ free( map->Points );
map->Points = pnts;
}
@@ -516,7 +516,7 @@ map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
map->v2 = v2;
map->dv = 1.0F / (v2 - v1);
if (map->Points)
- FREE( map->Points );
+ free( map->Points );
map->Points = pnts;
}
@@ -1048,44 +1048,44 @@ void _mesa_free_eval_data( struct gl_context *ctx )
/* Free evaluator data */
if (ctx->EvalMap.Map1Vertex3.Points)
- FREE( ctx->EvalMap.Map1Vertex3.Points );
+ free( ctx->EvalMap.Map1Vertex3.Points );
if (ctx->EvalMap.Map1Vertex4.Points)
- FREE( ctx->EvalMap.Map1Vertex4.Points );
+ free( ctx->EvalMap.Map1Vertex4.Points );
if (ctx->EvalMap.Map1Index.Points)
- FREE( ctx->EvalMap.Map1Index.Points );
+ free( ctx->EvalMap.Map1Index.Points );
if (ctx->EvalMap.Map1Color4.Points)
- FREE( ctx->EvalMap.Map1Color4.Points );
+ free( ctx->EvalMap.Map1Color4.Points );
if (ctx->EvalMap.Map1Normal.Points)
- FREE( ctx->EvalMap.Map1Normal.Points );
+ free( ctx->EvalMap.Map1Normal.Points );
if (ctx->EvalMap.Map1Texture1.Points)
- FREE( ctx->EvalMap.Map1Texture1.Points );
+ free( ctx->EvalMap.Map1Texture1.Points );
if (ctx->EvalMap.Map1Texture2.Points)
- FREE( ctx->EvalMap.Map1Texture2.Points );
+ free( ctx->EvalMap.Map1Texture2.Points );
if (ctx->EvalMap.Map1Texture3.Points)
- FREE( ctx->EvalMap.Map1Texture3.Points );
+ free( ctx->EvalMap.Map1Texture3.Points );
if (ctx->EvalMap.Map1Texture4.Points)
- FREE( ctx->EvalMap.Map1Texture4.Points );
+ free( ctx->EvalMap.Map1Texture4.Points );
for (i = 0; i < 16; i++)
- FREE((ctx->EvalMap.Map1Attrib[i].Points));
+ free((ctx->EvalMap.Map1Attrib[i].Points));
if (ctx->EvalMap.Map2Vertex3.Points)
- FREE( ctx->EvalMap.Map2Vertex3.Points );
+ free( ctx->EvalMap.Map2Vertex3.Points );
if (ctx->EvalMap.Map2Vertex4.Points)
- FREE( ctx->EvalMap.Map2Vertex4.Points );
+ free( ctx->EvalMap.Map2Vertex4.Points );
if (ctx->EvalMap.Map2Index.Points)
- FREE( ctx->EvalMap.Map2Index.Points );
+ free( ctx->EvalMap.Map2Index.Points );
if (ctx->EvalMap.Map2Color4.Points)
- FREE( ctx->EvalMap.Map2Color4.Points );
+ free( ctx->EvalMap.Map2Color4.Points );
if (ctx->EvalMap.Map2Normal.Points)
- FREE( ctx->EvalMap.Map2Normal.Points );
+ free( ctx->EvalMap.Map2Normal.Points );
if (ctx->EvalMap.Map2Texture1.Points)
- FREE( ctx->EvalMap.Map2Texture1.Points );
+ free( ctx->EvalMap.Map2Texture1.Points );
if (ctx->EvalMap.Map2Texture2.Points)
- FREE( ctx->EvalMap.Map2Texture2.Points );
+ free( ctx->EvalMap.Map2Texture2.Points );
if (ctx->EvalMap.Map2Texture3.Points)
- FREE( ctx->EvalMap.Map2Texture3.Points );
+ free( ctx->EvalMap.Map2Texture3.Points );
if (ctx->EvalMap.Map2Texture4.Points)
- FREE( ctx->EvalMap.Map2Texture4.Points );
+ free( ctx->EvalMap.Map2Texture4.Points );
for (i = 0; i < 16; i++)
- FREE((ctx->EvalMap.Map2Attrib[i].Points));
+ free((ctx->EvalMap.Map2Attrib[i].Points));
}
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index a775a9a..a619307 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -693,7 +693,7 @@ free_matrix_stack( struct gl_matrix_stack *stack )
for (i = 0; i < stack->MaxDepth; i++) {
_math_matrix_dtr(&stack->Stack[i]);
}
- FREE(stack->Stack);
+ free(stack->Stack);
stack->Stack = stack->Top = NULL;
}
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 8bf5f49..4514b12 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -155,7 +155,7 @@ void
_mesa_delete_sampler_object(struct gl_context *ctx,
struct gl_sampler_object *sampObj)
{
- FREE(sampObj);
+ free(sampObj);
}