Mesa (master): zink: fix layercount for array texture blits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Apr 2 14:23:28 UTC 2021


Module: Mesa
Branch: master
Commit: 44076a3d6c2e53c45e45e447827ceb7a6684616a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=44076a3d6c2e53c45e45e447827ceb7a6684616a

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Apr  1 22:39:47 2021 -0400

zink: fix layercount for array texture blits

3d is base, base+count, array is base, count

Fixes: 83bee837e5d ("zink: be more explicit about blit layer/depth usage")

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9999>

---

 src/gallium/drivers/zink/zink_blit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c
index 1b94980bf8a..43cc89cd054 100644
--- a/src/gallium/drivers/zink/zink_blit.c
+++ b/src/gallium/drivers/zink/zink_blit.c
@@ -145,7 +145,7 @@ blit_native(struct zink_context *ctx, const struct pipe_blit_info *info)
    case PIPE_TEXTURE_1D_ARRAY:
       /* these use layer */
       region.srcSubresource.baseArrayLayer = info->src.box.z;
-      region.srcSubresource.layerCount = info->src.box.z + info->src.box.depth;
+      region.srcSubresource.layerCount = info->src.box.depth;
       region.srcOffsets[0].z = 0;
       region.srcOffsets[1].z = 1;
       break;
@@ -178,7 +178,7 @@ blit_native(struct zink_context *ctx, const struct pipe_blit_info *info)
    case PIPE_TEXTURE_1D_ARRAY:
       /* these use layer */
       region.dstSubresource.baseArrayLayer = info->dst.box.z;
-      region.dstSubresource.layerCount = info->dst.box.z + info->dst.box.depth;
+      region.dstSubresource.layerCount = info->dst.box.depth;
       region.dstOffsets[0].z = 0;
       region.dstOffsets[1].z = 1;
       break;



More information about the mesa-commit mailing list