diff options
author | Brian Paul <[email protected]> | 2014-01-22 11:32:28 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2014-01-23 08:13:14 -0700 |
commit | 35ddd2cc5d1b25d9ca7f2473f4523791e37ed385 (patch) | |
tree | aad0e0b7441665fe0e6b016f2af748395398d978 | |
parent | 1f2007429e0874539c8360482f0720d78963c69c (diff) |
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 <[email protected]>
-rw-r--r-- | src/mesa/main/texobj.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |