Mesa (staging/21.1): lavapipe: fix mipmapped resolves.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 22 20:36:50 UTC 2021
Module: Mesa
Branch: staging/21.1
Commit: 38b948b5dc42cfcc3b5653b962cad611c50abe2c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=38b948b5dc42cfcc3b5653b962cad611c50abe2c
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Apr 22 12:46:10 2021 +1000
lavapipe: fix mipmapped resolves.
I updated CTS and found
EQP-VK.renderpass.suballocation.multisample_resolve.b8g8r8a8_unorm.samples_4_resolve_level_*
was failing.
Fixes: b38879f8c5f5 ("vallium: initial import of the vulkan frontend")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10400>
(cherry picked from commit 32a2978949a9781d72215aa8308ec216e6c6e561)
---
.pick_status.json | 2 +-
src/gallium/frontends/lavapipe/lvp_execute.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.pick_status.json b/.pick_status.json
index 0dce17196ae..f00e473d657 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -373,7 +373,7 @@
"description": "lavapipe: fix mipmapped resolves.",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "b38879f8c5f57b7f1802e433e33181bdf5e72aef"
},
diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c
index 0a39a9d596f..a1b1ab2d5ca 100644
--- a/src/gallium/frontends/lavapipe/lvp_execute.c
+++ b/src/gallium/frontends/lavapipe/lvp_execute.c
@@ -1499,6 +1499,9 @@ static void render_pass_resolve(struct rendering_state *state)
info.dst.box = info.src.box;
+ info.src.level = src_imgv->subresourceRange.baseMipLevel;
+ info.dst.level = dst_imgv->subresourceRange.baseMipLevel;
+
state->pctx->blit(state->pctx, &info);
}
}
More information about the mesa-commit
mailing list