From 092b7edb3f89b532c2118ca7824c35038260ef28 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 5 Mar 2014 18:43:23 -0800 Subject: [PATCH] meta: Make _mesa_meta_check_generate_mipmap_fallback static. This was only ever used in one place; there's no reason for it to be non-static. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner Reviewed-by: Anuj Phogat Reviewed-by: Ian Romanick --- src/mesa/drivers/common/meta.h | 4 ---- src/mesa/drivers/common/meta_generate_mipmap.c | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 16bd427eb99..6029a775cd5 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -410,10 +410,6 @@ _mesa_meta_Bitmap(struct gl_context *ctx, const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap); -extern GLboolean -_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target, - struct gl_texture_object *texObj); - extern void _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, struct gl_texture_object *texObj); diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c b/src/mesa/drivers/common/meta_generate_mipmap.c index f1bc291fc58..205c5e4c5e3 100644 --- a/src/mesa/drivers/common/meta_generate_mipmap.c +++ b/src/mesa/drivers/common/meta_generate_mipmap.c @@ -50,9 +50,9 @@ * images are mapped. * \return GL_TRUE if a fallback is needed, GL_FALSE otherwise */ -GLboolean -_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target, - struct gl_texture_object *texObj) +static GLboolean +fallback_required(struct gl_context *ctx, GLenum target, + struct gl_texture_object *texObj) { const GLuint fboSave = ctx->DrawBuffer->Name; struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap; @@ -175,7 +175,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, const GLint slice = 0; GLuint samplerSave; - if (_mesa_meta_check_generate_mipmap_fallback(ctx, target, texObj)) { + if (fallback_required(ctx, target, texObj)) { _mesa_generate_mipmap(ctx, target, texObj); return; }