diff --git a/.pick_status.json b/.pick_status.json index 45c39884df4..9ee76ac5f75 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3199,7 +3199,7 @@ "description": "zink: fix layered resolves", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "19906022e22cb37493861b6976c9623618b5b769" }, diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index 96824c8a049..81113728b41 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -43,19 +43,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;