From 1c3dc8c63218f12d9a09d6a31ddba9c4fe72288c Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:12:03 -0600
Subject: [PATCH] nvk/meta: Fix restore for descriptor set 0

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_cmd_meta.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/nouveau/vulkan/nvk_cmd_meta.c b/src/nouveau/vulkan/nvk_cmd_meta.c
index 161cd16..54dd6b6 100644
--- 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);
-- 
2.7.4