From 2dbffb30f05fcf67658c64b8101e9efaf07ca388 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 27 Jun 2005 00:34:17 +0000
Subject: Get rid of the MESA_PBUFFER_ALLOC/FREE() macros. If that stuff is
 still needed, lots of other updates are needed anyway. Also, some misc
 MALLOC/FREE -> _mesa_malloc/free() changes.

---
 src/mesa/drivers/dri/tdfx/tdfx_tex.c    | 6 +++---
 src/mesa/drivers/dri/unichrome/via_fb.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/mesa/drivers/dri')

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index 0ce660308f..cf4de23b36 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
@@ -1356,10 +1356,10 @@ tdfxTexImage2D(GLcontext *ctx, GLenum target, GLint level,
                                                         	1,
                                                         	internalFormat);
        dstRowStride = _mesa_compressed_row_stride(internalFormat, mml->width);
-       texImage->Data = MESA_PBUFFER_ALLOC(texImage->CompressedSize);
+       texImage->Data = _mesa_malloc(texImage->CompressedSize);
     } else {
        dstRowStride = mml->width * texelBytes;
-       texImage->Data = MESA_PBUFFER_ALLOC(mml->width * mml->height * texelBytes);
+       texImage->Data = _mesa_malloc(mml->width * mml->height * texelBytes);
     }
     if (!texImage->Data) {
        _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
@@ -1662,7 +1662,7 @@ tdfxCompressedTexImage2D (GLcontext *ctx, GLenum target,
                                                                 mml->height,
                                                                 1,
                                                                 internalFormat);
-       texImage->Data = MESA_PBUFFER_ALLOC(texImage->CompressedSize);
+       texImage->Data = _mesa_malloc(texImage->CompressedSize);
        if (!texImage->Data) {
           _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D");
           return;
diff --git a/src/mesa/drivers/dri/unichrome/via_fb.c b/src/mesa/drivers/dri/unichrome/via_fb.c
index e1215585ae..e07c200b32 100644
--- a/src/mesa/drivers/dri/unichrome/via_fb.c
+++ b/src/mesa/drivers/dri/unichrome/via_fb.c
@@ -156,7 +156,7 @@ via_alloc_texture(struct via_context *vmesa,
    }
    else if (t->memType == VIA_MEM_SYSTEM) {
       
-      t->bufAddr = MESA_PBUFFER_ALLOC(t->size);      
+      t->bufAddr = _mesa_malloc(t->size);      
       if (!t->bufAddr)
 	 goto cleanup;
 
@@ -226,8 +226,8 @@ via_free_texture(struct via_context *vmesa, struct via_tex_buffer *t)
    else if (t->memType == VIA_MEM_SYSTEM) {
       remove_from_list(t);
       vmesa->total_alloc[t->memType] -= t->size;
-      MESA_PBUFFER_FREE(t->bufAddr);
-      FREE(t);
+      _mesa_free(t->bufAddr);
+      _mesa_free(t);
    }
    else if (t->index && viaCheckBreadcrumb(vmesa, t->lastUsed)) {
       via_do_free_texture( vmesa, t );
-- 
cgit v1.2.3