[Mesa-dev] [PATCH 03/11] meta: Make _mesa_meta_check_generate_mipmap_fallback static.

Kenneth Graunke kenneth at whitecape.org
Thu Mar 6 02:47:19 PST 2014


This was only ever used in one place; there's no reason for it to be
non-static.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 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 16bd427..6029a77 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 f1bc291..205c5e4 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;
    }
-- 
1.9.0



More information about the mesa-dev mailing list