Mesa (master): zink: fix layered resolves

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Nov 23 18:41:29 2020 +0100

zink: fix layered resolves

Until recently, we ended up using u_blitter here, because
info->render_condition_enable was always true here. But when we recently
fixed that overly broad check, this broke.

So let's fix layered-resolves, by actually checking if the resource has
layers respect them in that case, similar to what we do in blit_native.

Fixes: 19906022e22 ("zink: more accurately track supported blits")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3843
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7737>

---

 src/gallium/drivers/zink/zink_blit.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c
index 4bcb43a2a81..99d344e43ce 100644
--- a/src/gallium/drivers/zink/zink_blit.c
+++ b/src/gallium/drivers/zink/zink_blit.c
@@ -40,19 +40,35 @@ blit_resolve(struct zink_context *ctx, const struct pipe_blit_info *info)
 
    region.srcSubresource.aspectMask = src->aspect;
    region.srcSubresource.mipLevel = info->src.level;
-   region.srcSubresource.baseArrayLayer = 0; // no clue
-   region.srcSubresource.layerCount = 1; // no clue
    region.srcOffset.x = info->src.box.x;
    region.srcOffset.y = info->src.box.y;
-   region.srcOffset.z = info->src.box.z;
+
+   if (src->base.array_size > 1) {
+      region.srcOffset.z = 0;
+      region.srcSubresource.baseArrayLayer = info->src.box.z;
+      region.srcSubresource.layerCount = info->src.box.depth;
+   } else {
+      assert(info->src.box.depth == 1);
+      region.srcOffset.z = info->src.box.z;
+      region.srcSubresource.baseArrayLayer = 0;
+      region.srcSubresource.layerCount = 1;
+   }
 
    region.dstSubresource.aspectMask = dst->aspect;
    region.dstSubresource.mipLevel = info->dst.level;
-   region.dstSubresource.baseArrayLayer = 0; // no clue
-   region.dstSubresource.layerCount = 1; // no clue
    region.dstOffset.x = info->dst.box.x;
    region.dstOffset.y = info->dst.box.y;
-   region.dstOffset.z = info->dst.box.z;
+
+   if (dst->base.array_size > 1) {
+      region.dstOffset.z = 0;
+      region.dstSubresource.baseArrayLayer = info->dst.box.z;
+      region.dstSubresource.layerCount = info->dst.box.depth;
+   } else {
+      assert(info->dst.box.depth == 1);
+      region.dstOffset.z = info->dst.box.z;
+      region.dstSubresource.baseArrayLayer = 0;
+      region.dstSubresource.layerCount = 1;
+   }
 
    region.extent.width = info->dst.box.width;
    region.extent.height = info->dst.box.height;