diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-11-23 18:41:29 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-11-24 22:08:18 -0800 |
| commit | c7fdc10cbad31f65119822067f42913a9701efe1 (patch) | |
| tree | 66eab5d29a87e6a9474052becf818c7258a19eee | |
| parent | 0a3935057263543f9199f01ed6bf09ca440c539b (diff) | |
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@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7737>
(cherry picked from commit 2ac396e2e5b966a247b698dcc44456fff1ffa0df)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_blit.c | 28 |
2 files changed, 23 insertions, 7 deletions
diff --git a/.pick_status.json b/.pick_status.json index a69bc806786..1475e69f559 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -652,7 +652,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 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; |