Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc versions

This commit is contained in:
Kristian Høgsberg
2010-02-19 11:58:49 -05:00
parent 6bf1ea897f
commit 32f2fd1c5d
132 changed files with 624 additions and 691 deletions

View File

@@ -1122,7 +1122,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
/* free old buffer storage */
if (rb->Data) {
_mesa_free(rb->Data);
free(rb->Data);
rb->Data = NULL;
}
@@ -1179,10 +1179,10 @@ alloc_storage_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb,
/* next, resize my alpha buffer */
if (arb->Data) {
_mesa_free(arb->Data);
free(arb->Data);
}
arb->Data = _mesa_malloc(width * height * sizeof(GLubyte));
arb->Data = malloc(width * height * sizeof(GLubyte));
if (arb->Data == NULL) {
arb->Width = 0;
arb->Height = 0;
@@ -1204,13 +1204,13 @@ static void
delete_renderbuffer_alpha8(struct gl_renderbuffer *arb)
{
if (arb->Data) {
_mesa_free(arb->Data);
free(arb->Data);
}
ASSERT(arb->Wrapped);
ASSERT(arb != arb->Wrapped);
arb->Wrapped->Delete(arb->Wrapped);
arb->Wrapped = NULL;
_mesa_free(arb);
free(arb);
}
@@ -1460,9 +1460,9 @@ void
_mesa_delete_renderbuffer(struct gl_renderbuffer *rb)
{
if (rb->Data) {
_mesa_free(rb->Data);
free(rb->Data);
}
_mesa_free(rb);
free(rb);
}