From 10a4412966b6401644d797ef185aeaad4dc5a900 Mon Sep 17 00:00:00 2001
From: Mohamed Ahmed <mohamedahmedegypt2001@gmail.com>
Date: Tue, 14 Mar 2023 13:57:40 +0200
Subject: [PATCH] vulkan/runtime: move common buffer related entrypoints to
 vk_buffer.c

Signed-off-by: Mohamed Ahmed <mohamedahmedegypt2001@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21898>
---
 src/vulkan/runtime/vk_buffer.c | 38 ++++++++++++++++++++++++++++++++++++++
 src/vulkan/runtime/vk_device.c | 37 -------------------------------------
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/vulkan/runtime/vk_buffer.c b/src/vulkan/runtime/vk_buffer.c
index a708d4f..2e7683d 100644
--- a/src/vulkan/runtime/vk_buffer.c
+++ b/src/vulkan/runtime/vk_buffer.c
@@ -23,6 +23,7 @@
 
 #include "vk_buffer.h"
 
+#include "vk_common_entrypoints.h"
 #include "vk_alloc.h"
 #include "vk_device.h"
 
@@ -71,3 +72,40 @@ vk_buffer_destroy(struct vk_device *device,
 {
    vk_object_free(device, alloc, buffer);
 }
+
+VKAPI_ATTR void VKAPI_CALL
+vk_common_GetBufferMemoryRequirements(VkDevice _device,
+                                      VkBuffer buffer,
+                                      VkMemoryRequirements *pMemoryRequirements)
+{
+   VK_FROM_HANDLE(vk_device, device, _device);
+
+   VkBufferMemoryRequirementsInfo2 info = {
+      .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2,
+      .buffer = buffer,
+   };
+   VkMemoryRequirements2 reqs = {
+      .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
+   };
+   device->dispatch_table.GetBufferMemoryRequirements2(_device, &info, &reqs);
+
+   *pMemoryRequirements = reqs.memoryRequirements;
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL
+vk_common_BindBufferMemory(VkDevice _device,
+                           VkBuffer buffer,
+                           VkDeviceMemory memory,
+                           VkDeviceSize memoryOffset)
+{
+   VK_FROM_HANDLE(vk_device, device, _device);
+
+   VkBindBufferMemoryInfo bind = {
+      .sType         = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO,
+      .buffer        = buffer,
+      .memory        = memory,
+      .memoryOffset  = memoryOffset,
+   };
+
+   return device->dispatch_table.BindBufferMemory2(_device, 1, &bind);
+}
\ No newline at end of file
diff --git a/src/vulkan/runtime/vk_device.c b/src/vulkan/runtime/vk_device.c
index 0037629..5546396 100644
--- a/src/vulkan/runtime/vk_device.c
+++ b/src/vulkan/runtime/vk_device.c
@@ -444,43 +444,6 @@ vk_common_GetDeviceGroupPeerMemoryFeatures(
 }
 
 VKAPI_ATTR void VKAPI_CALL
-vk_common_GetBufferMemoryRequirements(VkDevice _device,
-                                      VkBuffer buffer,
-                                      VkMemoryRequirements *pMemoryRequirements)
-{
-   VK_FROM_HANDLE(vk_device, device, _device);
-
-   VkBufferMemoryRequirementsInfo2 info = {
-      .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2,
-      .buffer = buffer,
-   };
-   VkMemoryRequirements2 reqs = {
-      .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
-   };
-   device->dispatch_table.GetBufferMemoryRequirements2(_device, &info, &reqs);
-
-   *pMemoryRequirements = reqs.memoryRequirements;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL
-vk_common_BindBufferMemory(VkDevice _device,
-                           VkBuffer buffer,
-                           VkDeviceMemory memory,
-                           VkDeviceSize memoryOffset)
-{
-   VK_FROM_HANDLE(vk_device, device, _device);
-
-   VkBindBufferMemoryInfo bind = {
-      .sType         = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO,
-      .buffer        = buffer,
-      .memory        = memory,
-      .memoryOffset  = memoryOffset,
-   };
-
-   return device->dispatch_table.BindBufferMemory2(_device, 1, &bind);
-}
-
-VKAPI_ATTR void VKAPI_CALL
 vk_common_GetImageMemoryRequirements(VkDevice _device,
                                      VkImage image,
                                      VkMemoryRequirements *pMemoryRequirements)
-- 
2.7.4