summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Bouron <matthieu.bouron@gmail.com>2023-05-09 12:29:33 +0200
committerEric Engestrom <eric@engestrom.ch>2023-05-09 16:56:49 +0100
commitfb1c2a3dcd3b066487716dcc6853605487abbe7b (patch)
treefbaac6e69c1ddc8592c7e5b5246038922943cc13
parent3e9b9fdc77867ac867ff9f385f94503b1de9257e (diff)
downloadmesa-fb1c2a3dcd3b066487716dcc6853605487abbe7b.tar.gz
lavapipe: honor dst base array layer when resolving color attachments
CC: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22924> (cherry picked from commit 57afa7c0b12d6d0c9013368853080dfea5b50d07)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/frontends/lavapipe/lvp_execute.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 03217e25520..34020d3801a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
"description": "lavapipe: honor dst base array layer when resolving color attachments",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c
index bc8c7d69582..ce70ccd46bf 100644
--- a/src/gallium/frontends/lavapipe/lvp_execute.c
+++ b/src/gallium/frontends/lavapipe/lvp_execute.c
@@ -1778,6 +1778,7 @@ resolve_color(struct rendering_state *state, bool multi)
info.src.box.depth = state->framebuffer.layers;
info.dst.box = info.src.box;
+ info.dst.box.z = dst_imgv->vk.base_array_layer;
info.src.level = src_imgv->vk.base_mip_level;
info.dst.level = dst_imgv->vk.base_mip_level;