[Mesa-dev] [PATCH] mesa: rename rowStride to imageStride in texturesubimage()

[Ilia Mirkin]

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

On Thu, Aug 27, 2015 at 5:16 PM, Brian Paul <brianp at vmware.com> wrote:
> ---
>  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 8d94903..3647854 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 = 0; i < 6; ++i) {
>           texImage = texObj->Image[i][level];
> @@ -3813,7 +3813,7 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
>                                   level, xoffset, yoffset, zoffset,
>                                   width, height, 1, format,
>                                   type, pixels, true);
> -         pixels = (GLubyte *) pixels + rowStride;
> +         pixels = (GLubyte *) pixels + imageStride;
>        }
>     }
>     else {
> --
> 1.9.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev