From 0a9903f778fcaa4941f51c488f73a501857765e0 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 26 Jul 2023 14:22:47 -0500
Subject: [PATCH] nvk: Stop using vk_cmd_set_dynamic_graphics_state in
 meta_end()

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

diff --git a/src/nouveau/vulkan/nvk_cmd_meta.c b/src/nouveau/vulkan/nvk_cmd_meta.c
index 18b777d437e..af5d455615a 100644
--- a/src/nouveau/vulkan/nvk_cmd_meta.c
+++ b/src/nouveau/vulkan/nvk_cmd_meta.c
@@ -79,7 +79,12 @@ static void
 nvk_meta_end(struct nvk_cmd_buffer *cmd,
              struct nvk_meta_save *save)
 {
-   vk_cmd_set_dynamic_graphics_state(&cmd->vk, &save->dynamic);
+   /* Restore the dynamic state */
+   cmd->vk.dynamic_graphics_state = save->dynamic;
+   memcpy(cmd->vk.dynamic_graphics_state.dirty,
+          cmd->vk.dynamic_graphics_state.set,
+          sizeof(cmd->vk.dynamic_graphics_state.set));
+
    if (save->pipeline)
       nvk_cmd_bind_graphics_pipeline(cmd, save->pipeline);