From b877922b07044d2ca4a0e46823a151fe9290cc76 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:11:55 -0600
Subject: [PATCH] nvk: Save/restore push constants around meta ops

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

diff --git a/src/nouveau/vulkan/nvk_cmd_meta.c b/src/nouveau/vulkan/nvk_cmd_meta.c
index a363fd886ef..a8be8ba58bf 100644
--- a/src/nouveau/vulkan/nvk_cmd_meta.c
+++ b/src/nouveau/vulkan/nvk_cmd_meta.c
@@ -59,7 +59,9 @@ nvk_meta_begin(struct nvk_cmd_buffer *cmd,
    save->pipeline = cmd->state.gfx.pipeline;
    save->vb0 = cmd->state.gfx.vb0;
 
-   /* TODO: Push */
+   STATIC_ASSERT(sizeof(save->push) ==
+                 sizeof(cmd->state.gfx.descriptors.root.push));
+   memcpy(save->push, cmd->state.gfx.descriptors.root.push, sizeof(save->push));
 }
 
 static void
@@ -96,7 +98,7 @@ nvk_meta_end(struct nvk_cmd_buffer *cmd,
 
    nvk_cmd_bind_vertex_buffer(cmd, 0, save->vb0);
 
-   /* TODO: Push */
+   memcpy(cmd->state.gfx.descriptors.root.push, save->push, sizeof(save->push));
 }
 
 VKAPI_ATTR void VKAPI_CALL