Mesa (master): mesa: make _mesa_bind_texture_unit() static

Brian Paul brianp at kemper.freedesktop.org
Tue Aug 25 00:57:00 UTC 2015


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 24 07:50:51 2015 -0600

mesa: make _mesa_bind_texture_unit() static

It's only called from the file it's defined in.

Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>

---

 src/mesa/main/texobj.c |   10 +++++-----
 src/mesa/main/texobj.h |    4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 395e4d3..c5d83e1 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1745,10 +1745,10 @@ _mesa_BindTexture( GLenum target, GLuint texName )
  * texture object will be decremented.  It'll be deleted if the
  * count hits zero.
  */
-void
-_mesa_bind_texture_unit(struct gl_context *ctx,
-                        GLuint unit,
-                        struct gl_texture_object *texObj)
+static void
+bind_texture_unit(struct gl_context *ctx,
+                  GLuint unit,
+                  struct gl_texture_object *texObj)
 {
    struct gl_texture_unit *texUnit;
 
@@ -1837,7 +1837,7 @@ _mesa_BindTextureUnit(GLuint unit, GLuint texture)
    }
    assert(valid_texture_object(texObj));
 
-   _mesa_bind_texture_unit(ctx, unit, texObj);
+   bind_texture_unit(ctx, unit, texObj);
 }
 
 
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index ec5ccb2..690878c 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -209,10 +209,6 @@ extern void
 _mesa_delete_nameless_texture(struct gl_context *ctx,
                               struct gl_texture_object *texObj);
 
-extern void
-_mesa_bind_texture_unit(struct gl_context *ctx,
-                        GLuint unit,
-                        struct gl_texture_object *texObj);
 
 /*@}*/
 




More information about the mesa-commit mailing list