From: Brian Paul <brianp@vmware.com>
Date: Wed, 22 Jan 2014 18:32:28 +0000 (-0700)
Subject: mesa: rename unbind_texobj_from_imgunits()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35ddd2cc5d1b25d9ca7f2473f4523791e37ed385;p=mesa.git

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@amd.com>
---

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 3c64c43764d..5d516c55f44 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);