From 3a88e3f18bd3fdbd31da798cd8cb6e382469cb2b Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Sun, 25 Feb 2024 13:32:17 -0600
Subject: [PATCH] nvk: Support VkBindMemoryStatusKHR

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27796>
---
 src/nouveau/vulkan/nvk_buffer.c | 5 +++++
 src/nouveau/vulkan/nvk_image.c  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/nouveau/vulkan/nvk_buffer.c b/src/nouveau/vulkan/nvk_buffer.c
index c9d217192ad..24c8307fea9 100644
--- a/src/nouveau/vulkan/nvk_buffer.c
+++ b/src/nouveau/vulkan/nvk_buffer.c
@@ -251,6 +251,11 @@ nvk_BindBufferMemory2(VkDevice device,
       } else {
          buffer->addr = mem->bo->offset + pBindInfos[i].memoryOffset;
       }
+
+      const VkBindMemoryStatusKHR *status =
+         vk_find_struct_const(pBindInfos[i].pNext, BIND_MEMORY_STATUS_KHR);
+      if (status != NULL && status->pResult != NULL)
+         *status->pResult = VK_SUCCESS;
    }
    return VK_SUCCESS;
 }
diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c
index a24d2c9b46e..358053fef95 100644
--- a/src/nouveau/vulkan/nvk_image.c
+++ b/src/nouveau/vulkan/nvk_image.c
@@ -1106,6 +1106,11 @@ nvk_BindImageMemory2(VkDevice device,
 
       if (image->stencil_copy_temp.nil.size_B > 0)
          nvk_image_plane_bind(dev, &image->stencil_copy_temp, mem, &offset_B);
+
+      const VkBindMemoryStatusKHR *status =
+         vk_find_struct_const(pBindInfos[i].pNext, BIND_MEMORY_STATUS_KHR);
+      if (status != NULL && status->pResult != NULL)
+         *status->pResult = VK_SUCCESS;
    }
 
    return VK_SUCCESS;