From 6dfb36c636bf9717b0dadf1c2024834bb4ebe28a Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:11:48 -0600
Subject: [PATCH] nvk: Add a couple descriptor set address helpers

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

diff --git a/src/nouveau/vulkan/nvk_descriptor_set.h b/src/nouveau/vulkan/nvk_descriptor_set.h
index 9ec0b701cb2..09c1a00e929 100644
--- a/src/nouveau/vulkan/nvk_descriptor_set.h
+++ b/src/nouveau/vulkan/nvk_descriptor_set.h
@@ -3,6 +3,8 @@
 
 #include "nvk_private.h"
 
+#include "nouveau_bo.h"
+#include "nouveau_push.h"
 #include "vulkan/runtime/vk_object.h"
 
 struct nvk_descriptor_set_layout;
@@ -51,4 +53,18 @@ struct nvk_descriptor_set {
 VK_DEFINE_HANDLE_CASTS(nvk_descriptor_set, base, VkDescriptorSet,
                        VK_OBJECT_TYPE_DESCRIPTOR_SET)
 
+static void
+nvk_push_descriptor_set_ref(struct nouveau_ws_push *push,
+                            const struct nvk_descriptor_set *set)
+{
+   if (set->bo)
+      nouveau_ws_push_ref(push, set->bo, NOUVEAU_WS_BO_RD);
+}
+
+static inline uint64_t
+nvk_descriptor_set_addr(const struct nvk_descriptor_set *set)
+{
+   return set->bo->offset + set->bo_offset;
+}
+
 #endif