[Mesa-dev] [PATCH] main: Fixed _mesa_GetCompressedTexImage_sw to copy slices correctly.

[Brian Paul]

On 02/17/2015 11:23 AM, Laura Ekstrand wrote:
> Previously array textures were not working with GetCompressedTextureImage,
> leading to failures in the test
> arb_direct_state_access/getcompressedtextureimage.c.
>
> Tested on Haswell.
> ---
>   src/mesa/main/texgetimage.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
> index d3a72e6..3f9f929 100644
> --- a/src/mesa/main/texgetimage.c
> +++ b/src/mesa/main/texgetimage.c
> @@ -740,7 +740,7 @@ _mesa_GetCompressedTexImage_sw(struct gl_context *ctx,
>         GLubyte *src;
>
>         /* map src texture buffer */
> -      ctx->Driver.MapTextureImage(ctx, texImage, 0,
> +      ctx->Driver.MapTextureImage(ctx, texImage, slice,
>                                     0, 0, texImage->Width, texImage->Height,
>                                     GL_MAP_READ_BIT, &src, &srcRowStride);
>
> @@ -752,7 +752,7 @@ _mesa_GetCompressedTexImage_sw(struct gl_context *ctx,
>               src += srcRowStride;
>            }
>
> -         ctx->Driver.UnmapTextureImage(ctx, texImage, 0);
> +         ctx->Driver.UnmapTextureImage(ctx, texImage, slice);
>
>            /* Advance to next slice */
>            dest += store.TotalBytesPerRow * (store.TotalRowsPerSlice - store.CopyRowsPerSlice);
>

Reviewed-by: Brian Paul <brianp at vmware.com>

Also tag for the 10.5 and 10.4 branches?