From 5401590815b0ef095e7881bbabce233bab07c1e6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 27 Jul 2011 12:56:07 -0700 Subject: [PATCH] Rename some driver FreeTextureImageData functions to FreeTextureImageBuffer. Reviewed-by: Brian Paul Reviewed-by: Ian Romanick --- 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 8744540f1ba..1c607246cd6 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 4053f22c32e..098a4d6caa9 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; -- 2.30.2