Mesa (master): mesa: rename unbind_texobj_from_imgunits()

Brian Paul brianp at kemper.freedesktop.org
Thu Jan 23 15:21:56 UTC 2014


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

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 22 11:32:28 2014 -0700

mesa: rename unbind_texobj_from_imgunits()

... to unbind_texobj_from_image_units() and change a local var's type
to silence an MSVC warning.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/main/texobj.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 3c64c437..5d516c5 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1104,10 +1104,10 @@ unbind_texobj_from_texunits(struct gl_context *ctx,
  * and unbind it if that's the case.
  */
 static void
-unbind_texobj_from_imgunits(struct gl_context *ctx,
-                            struct gl_texture_object *texObj)
+unbind_texobj_from_image_units(struct gl_context *ctx,
+                               struct gl_texture_object *texObj)
 {
-   int i;
+   GLuint i;
 
    for (i = 0; i < ctx->Const.MaxImageUnits; i++) {
       struct gl_image_unit *unit = &ctx->ImageUnits[i];
@@ -1169,7 +1169,7 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
              * image unit.  If so, unbind it.
              * See section 3.9.X of GL_ARB_shader_image_load_store.
              */
-            unbind_texobj_from_imgunits(ctx, delObj);
+            unbind_texobj_from_image_units(ctx, delObj);
 
             _mesa_unlock_texture(ctx, delObj);
 




More information about the mesa-commit mailing list