diff options
author | Laura Ekstrand <[email protected]> | 2015-02-16 14:29:57 -0800 |
---|---|---|
committer | Laura Ekstrand <[email protected]> | 2015-02-17 13:45:48 -0800 |
commit | 92163482bda87216764edc0beca3ca090678038d (patch) | |
tree | 2d3b53887f24c014fb25c7f362db96efdbb4a993 | |
parent | 4470bf1f494ce313bda4f1627c775569d886f93f (diff) |
main: Fixed _mesa_GetCompressedTexImage_sw to copy slices correctly.
Previously array textures were not working with GetCompressedTextureImage,
leading to failures in the test
arb_direct_state_access/getcompressedtextureimage.c.
Tested-by: Laura Ekstrand <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Cc: "10.4, 10.5" <[email protected]>
-rw-r--r-- | src/mesa/main/texgetimage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 23cc3f06f07..24df5b6f89d 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -742,7 +742,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); @@ -754,7 +754,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); |