From 13dca99623ece006ced8dfb4dbde575064246f6b Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:11:47 -0600
Subject: [PATCH] nvk/image: Add image address helpers

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

diff --git a/src/nouveau/vulkan/nvk_image.h b/src/nouveau/vulkan/nvk_image.h
index a0b3528..c54ee14 100644
--- a/src/nouveau/vulkan/nvk_image.h
+++ b/src/nouveau/vulkan/nvk_image.h
@@ -2,7 +2,10 @@
 #define NVK_IMAGE_H 1
 
 #include "nvk_private.h"
+#include "nvk_device_memory.h"
 
+#include "nouveau_bo.h"
+#include "nouveau_push.h"
 #include "vulkan/runtime/vk_image.h"
 
 /* x can either be 0x0 or 0xe
@@ -39,4 +42,18 @@ struct nvk_image {
 
 VK_DEFINE_HANDLE_CASTS(nvk_image, vk.base, VkImage, VK_OBJECT_TYPE_IMAGE)
 
+static void
+nvk_push_image_ref(struct nouveau_ws_push *push,
+                   const struct nvk_image *image,
+                   enum nouveau_ws_bo_map_flags flags)
+{
+   nouveau_ws_push_ref(push, image->mem->bo, flags);
+}
+
+static inline uint64_t
+nvk_image_base_address(struct nvk_image *image)
+{
+   return image->mem->bo->offset + image->offset;
+}
+
 #endif
-- 
2.7.4