[Mesa-dev] [PATCH 02/14] Rename some driver FreeTextureImageData functions to FreeTextureImageBuffer.

[Eric Anholt]

---
 src/mesa/drivers/dri/intel/intel_tex.c   |    5 +++--
 src/mesa/drivers/dri/unichrome/via_tex.c |    6 +++---
 src/mesa/state_tracker/st_cb_texture.c   |    4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex.c 
b/src/mesa/drivers/dri/intel/intel_tex.c
index 8744540..1c60724 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.c
+++ b/src/mesa/drivers/dri/intel/intel_tex.c
@@ -45,7 +45,8 @@ intelDeleteTextureObject(struct gl_context *ctx,
 
 
 static void
-intelFreeTextureImageData(struct gl_context * ctx, struct gl_texture_image 
*texImage)
+intel_free_texture_image_buffer(struct gl_context * ctx,
+                               struct gl_texture_image *texImage)
 {
    struct intel_context *intel = intel_context(ctx);
    struct intel_texture_image *intelImage = intel_texture_image(texImage);
@@ -123,5 +124,5 @@ intelInitTextureFuncs(struct dd_function_table *functions)
    functions->NewTextureObject = intelNewTextureObject;
    functions->NewTextureImage = intelNewTextureImage;
    functions->DeleteTexture = intelDeleteTextureObject;
-   functions->FreeTextureImageBuffer = intelFreeTextureImageData;
+   functions->FreeTextureImageBuffer = intel_free_texture_image_buffer;
 }
diff --git a/src/mesa/drivers/dri/unichrome/via_tex.c 
b/src/mesa/drivers/dri/unichrome/via_tex.c
index f65ab07..69e2764 100644
--- a/src/mesa/drivers/dri/unichrome/via_tex.c
+++ b/src/mesa/drivers/dri/unichrome/via_tex.c
@@ -895,8 +895,8 @@ static struct gl_texture_object *viaNewTextureObject( 
struct gl_context *ctx,
 }
 
 
-static void viaFreeTextureImageData( struct gl_context *ctx, 
-                                    struct gl_texture_image *texImage )
+static void viaFreeTextureImageBuffer(struct gl_context *ctx,
+                                     struct gl_texture_image *texImage)
 {
    struct via_context *vmesa = VIA_CONTEXT(ctx);
    struct via_texture_image *image = (struct via_texture_image *)texImage;
@@ -923,7 +923,7 @@ void viaInitTextureFuncs(struct dd_function_table * 
functions)
    functions->NewTextureObject = viaNewTextureObject;
    functions->NewTextureImage = viaNewTextureImage;
    functions->DeleteTexture = _mesa_delete_texture_object;
-   functions->FreeTextureImageBuffer = viaFreeTextureImageData;
+   functions->FreeTextureImageBuffer = viaFreeTextureImageBuffer;
 
 #if 0 && defined( USE_SSE_ASM )
    /*
diff --git a/src/mesa/state_tracker/st_cb_texture.c 
b/src/mesa/state_tracker/st_cb_texture.c
index 4053f22..098a4d6 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -144,7 +144,7 @@ st_DeleteTextureObject(struct gl_context *ctx,
 
 /** called via ctx->Driver.FreeTextureImageBuffer() */
 static void
-st_FreeTextureImageData(struct gl_context * ctx, struct gl_texture_image 
*texImage)
+st_FreeTextureImageBuffer(struct gl_context * ctx, struct gl_texture_image 
*texImage)
 {
    struct st_texture_image *stImage = st_texture_image(texImage);
 
@@ -1880,7 +1880,7 @@ st_init_texture_functions(struct dd_function_table 
*functions)
    functions->NewTextureObject = st_NewTextureObject;
    functions->NewTextureImage = st_NewTextureImage;
    functions->DeleteTexture = st_DeleteTextureObject;
-   functions->FreeTextureImageBuffer = st_FreeTextureImageData;
+   functions->FreeTextureImageBuffer = st_FreeTextureImageBuffer;
 
    functions->TextureMemCpy = do_memcpy;
 
-- 
1.7.5.4

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev