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/glide/fxddtex.c | 6 +++---
 src/mesa/drivers/glide/fxsetup.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index e7b7ec3198..f3f12c4cc7 100644
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -1399,10 +1399,10 @@ fxDDTexImage2D(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");
@@ -1665,7 +1665,7 @@ fxDDCompressedTexImage2D (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/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index ee945dc886..360a42f7e8 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -106,14 +106,14 @@ fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj)
                       &(mml->wScale), &(mml->hScale));
          _w *= mml->wScale;
          _h *= mml->hScale;
-         texImage->Data = MESA_PBUFFER_ALLOC(_w * _h * texelBytes);
+         texImage->Data = _mesa_malloc(_w * _h * texelBytes);
          _mesa_rescale_teximage2d(texelBytes,
                                   mml->width,
                                   _w * texelBytes, /* dst stride */
                                   mml->width, mml->height, /* src */
                                   _w, _h, /* dst */
                                   texImage_Data /*src*/, texImage->Data /*dst*/ );
-         MESA_PBUFFER_FREE(texImage_Data);
+         _mesa_free(texImage_Data);
          mml->width = _w;
          mml->height = _h;
          /* (!) ... and set mml->wScale = _w / texImage->Width */
-- 
cgit v1.2.3