From db509248671db1dbbb8d22d302213516728ce6fe Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 9 Aug 2023 15:21:47 -0400 Subject: [PATCH] lavapipe: fix resolves where src image has a layer offset cc: mesa-stable Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 9e2f95eae3d405237a12fc92337c9386a3ee47e1) --- .pick_status.json | 2 +- src/gallium/frontends/lavapipe/lvp_execute.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index aff0fbcfa40..d2bf348182f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -8954,7 +8954,7 @@ "description": "lavapipe: fix resolves where src image has a layer offset", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 78aafe4fce7..5f5fcc03118 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -1546,6 +1546,7 @@ resolve_color(struct rendering_state *state, bool multi) info.src.box.depth = state->framebuffer.layers; info.dst.box = info.src.box; + info.src.box.z = src_imgv->vk.base_array_layer; info.dst.box.z = dst_imgv->vk.base_array_layer; info.src.level = src_imgv->vk.base_mip_level;