nvk/meta: Fix restore for descriptor set 0

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>

diff --git a/src/nouveau/vulkan/nvk_cmd_meta.c b/src/nouveau/vulkan/nvk_cmd_meta.c
index 161cd16..54dd6b6 100644 (file)
--- a/src/nouveau/vulkan/nvk_cmd_meta.c
+++ b/src/nouveau/vulkan/nvk_cmd_meta.c
@@ -99,7 +99,9 @@ nvk_meta_end(struct nvk_cmd_buffer *cmd,
 {
    if (save->desc0) {
       cmd->state.gfx.descriptors.sets[0] = save->desc0;
+      cmd->state.gfx.descriptors.root.sets[0] = nvk_descriptor_set_addr(save->desc0);
       cmd->state.gfx.descriptors.sets_dirty |= BITFIELD_BIT(0);
+      cmd->state.gfx.descriptors.push_dirty &= ~BITFIELD_BIT(0);
    } else if (save->has_push_desc0) {
       *cmd->state.gfx.descriptors.push[0] = save->push_desc0;
       cmd->state.gfx.descriptors.push_dirty |= BITFIELD_BIT(0);