Mesa (master): Rename some driver FreeTextureImageData functions to FreeTextureImageBuffer .

Eric Anholt anholt at kemper.freedesktop.org
Mon Aug 29 10:22:28 PDT 2011


Module: Mesa
Branch: master
Commit: 5401590815b0ef095e7881bbabce233bab07c1e6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5401590815b0ef095e7881bbabce233bab07c1e6

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jul 27 12:56:07 2011 -0700

Rename some driver FreeTextureImageData functions to FreeTextureImageBuffer.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/drivers/dri/intel/intel_tex.c |    5 +++--
 src/mesa/state_tracker/st_cb_texture.c |    4 ++--
 2 files changed, 5 insertions(+), 4 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/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;
 



More information about the mesa-commit mailing list