Mesa (master): mesa: rename rowStride to imageStride in texturesubimage()
Brian Paul
brianp at kemper.freedesktop.org
Thu Aug 27 21:22:17 UTC 2015
Module: Mesa
Branch: master
Commit: 52f748792393c681f35025be7d843e6426fa327d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=52f748792393c681f35025be7d843e6426fa327d
Author: Brian Paul <brianp at vmware.com>
Date: Thu Aug 27 14:33:40 2015 -0600
mesa: rename rowStride to imageStride in texturesubimage()
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
src/mesa/main/teximage.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index ee4b610..bfb0858 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3764,7 +3764,7 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
/* Must handle special case GL_TEXTURE_CUBE_MAP. */
if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
- GLint rowStride;
+ GLint imageStride;
/*
* What do we do if the user created a texture with the following code
@@ -3802,8 +3802,8 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
return;
}
- rowStride = _mesa_image_image_stride(&ctx->Unpack, width, height,
- format, type);
+ imageStride = _mesa_image_image_stride(&ctx->Unpack, width, height,
+ format, type);
/* Copy in each face. */
for (i = zoffset; i < zoffset + depth; ++i) {
texImage = texObj->Image[i][level];
@@ -3813,7 +3813,7 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
level, xoffset, yoffset, 0,
width, height, 1, format,
type, pixels, true);
- pixels = (GLubyte *) pixels + rowStride;
+ pixels = (GLubyte *) pixels + imageStride;
}
}
else {
More information about the mesa-commit
mailing list