Mesa (master): zink: also fix image buffer layer copying

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Mar 22 15:34:18 2021 -0400

zink: also fix image buffer layer copying

this differs based on image type

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

---

 src/gallium/drivers/zink/zink_context.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index c4bd6ad6d71..212dd736f68 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -2056,14 +2056,30 @@ zink_copy_image_buffer(struct zink_context *ctx, struct zink_batch *batch, struc
    region.bufferRowLength = 0;
    region.bufferImageHeight = 0;
    region.imageSubresource.mipLevel = buf2img ? dst_level : src_level;
-   region.imageSubresource.layerCount = 1;
-   if (img->base.array_size > 1) {
+   switch (img->base.target) {
+   case PIPE_TEXTURE_CUBE:
+   case PIPE_TEXTURE_CUBE_ARRAY:
+   case PIPE_TEXTURE_2D_ARRAY:
+   case PIPE_TEXTURE_1D_ARRAY:
+      /* these use layer */
       region.imageSubresource.baseArrayLayer = buf2img ? dstz : src_box->z;
       region.imageSubresource.layerCount = src_box->depth;
+      region.imageOffset.z = 0;
       region.imageExtent.depth = 1;
-   } else {
+      break;
+   case PIPE_TEXTURE_3D:
+      /* this uses depth */
+      region.imageSubresource.baseArrayLayer = 0;
+      region.imageSubresource.layerCount = 1;
       region.imageOffset.z = buf2img ? dstz : src_box->z;
       region.imageExtent.depth = src_box->depth;
+      break;
+   default:
+      /* these must only copy one layer */
+      region.imageSubresource.baseArrayLayer = 0;
+      region.imageSubresource.layerCount = 1;
+      region.imageOffset.z = 0;
+      region.imageExtent.depth = 1;
    }
    region.imageOffset.x = buf2img ? dstx : src_box->x;
    region.imageOffset.y = buf2img ? dsty : src_box->y;