From 0bb29949ba8a9e5a15dc0640dbb0a4e7990a1d57 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 27 Jul 2011 12:29:48 -0700
Subject: mesa: Rename FreeTexImageData to FreeTextureImageBuffer.

This was produced by sed, except for one hunk in driverfuncs.c where
trailing whitespace was dropped.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/context.c  |  2 +-
 src/mesa/main/dd.h       |  2 +-
 src/mesa/main/mipmap.c   |  2 +-
 src/mesa/main/teximage.c | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b83a5d621fa..0cf794735bb 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -907,7 +907,7 @@ _mesa_initialize_context(struct gl_context *ctx,
 
    /*ASSERT(driverContext);*/
    assert(driverFunctions->NewTextureObject);
-   assert(driverFunctions->FreeTexImageData);
+   assert(driverFunctions->FreeTextureImageBuffer);
 
    ctx->API = api;
    ctx->Visual = *visual;
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index fcf40ecf102..3164ac87ef9 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -479,7 +479,7 @@ struct dd_function_table {
    /** 
     * Called to free tImage->Data.
     */
-   void (*FreeTexImageData)( struct gl_context *ctx, struct gl_texture_image *tImage );
+   void (*FreeTextureImageBuffer)( struct gl_context *ctx, struct gl_texture_image *tImage );
 
    /** Map texture image data into user space */
    void (*MapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 8a811cb7225..611f3755010 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1949,7 +1949,7 @@ generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target,
 
       /* Free old image data */
       if (dstImage->Data)
-         ctx->Driver.FreeTexImageData(ctx, dstImage);
+         ctx->Driver.FreeTextureImageBuffer(ctx, dstImage);
 
       /* initialize new image */
       _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight,
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index a005d2935fa..8fdebad1940 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -595,7 +595,7 @@ _mesa_new_texture_image( struct gl_context *ctx )
 
 /**
  * Free texture image data.
- * This function is a fallback called via ctx->Driver.FreeTexImageData().
+ * This function is a fallback called via ctx->Driver.FreeTextureImageBuffer().
  *
  * \param texImage texture image.
  *
@@ -630,8 +630,8 @@ _mesa_delete_texture_image(struct gl_context *ctx,
    /* Free texImage->Data and/or any other driver-specific texture
     * image storage.
     */
-   ASSERT(ctx->Driver.FreeTexImageData);
-   ctx->Driver.FreeTexImageData( ctx, texImage );
+   ASSERT(ctx->Driver.FreeTextureImageBuffer);
+   ctx->Driver.FreeTextureImageBuffer( ctx, texImage );
 
    ASSERT(texImage->Data == NULL);
    if (texImage->ImageOffsets)
@@ -1211,7 +1211,7 @@ void
 _mesa_clear_texture_image(struct gl_context *ctx,
                           struct gl_texture_image *texImage)
 {
-   ctx->Driver.FreeTexImageData(ctx, texImage);
+   ctx->Driver.FreeTextureImageBuffer(ctx, texImage);
    clear_teximage_fields(texImage);
 }
 
@@ -2457,7 +2457,7 @@ teximage(struct gl_context *ctx, GLuint dims,
             gl_format texFormat;
 
             if (texImage->Data) {
-               ctx->Driver.FreeTexImageData( ctx, texImage );
+               ctx->Driver.FreeTextureImageBuffer( ctx, texImage );
             }
 
             ASSERT(texImage->Data == NULL);
@@ -2598,7 +2598,7 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glEGLImageTargetTexture2D");
    } else {
       if (texImage->Data)
-	 ctx->Driver.FreeTexImageData( ctx, texImage );
+	 ctx->Driver.FreeTextureImageBuffer( ctx, texImage );
 
       ASSERT(texImage->Data == NULL);
       ctx->Driver.EGLImageTargetTexture2D(ctx, target,
@@ -2804,7 +2804,7 @@ copyteximage(struct gl_context *ctx, GLuint dims,
             GLint srcX = x, srcY = y, dstX = 0, dstY = 0;
 
             /* Free old texture image */
-            ctx->Driver.FreeTexImageData(ctx, texImage);
+            ctx->Driver.FreeTextureImageBuffer(ctx, texImage);
 
             _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
                                        border, internalFormat, texFormat);
@@ -3363,7 +3363,7 @@ compressedteximage(struct gl_context *ctx, GLuint dims,
             gl_format texFormat;
 
             if (texImage->Data) {
-               ctx->Driver.FreeTexImageData( ctx, texImage );
+               ctx->Driver.FreeTextureImageBuffer( ctx, texImage );
             }
             ASSERT(texImage->Data == NULL);
 
-- 
cgit v1.2.3