radv: use common GetBufferMemoryRequirements2()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22047>

diff --git a/src/amd/vulkan/radv_acceleration_structure.c b/src/amd/vulkan/radv_acceleration_structure.c
index 855dac6..a3c50d1 100644 (file)
--- a/src/amd/vulkan/radv_acceleration_structure.c
+++ b/src/amd/vulkan/radv_acceleration_structure.c
@@ -454,7 +454,7 @@ radv_device_init_null_accel_struct(struct radv_device *device)
    VkMemoryRequirements2 mem_req = {
       .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
    };
-   radv_GetBufferMemoryRequirements2(_device, &info, &mem_req);
+   vk_common_GetBufferMemoryRequirements2(_device, &info, &mem_req);
 
    VkMemoryAllocateInfo alloc_info = {
       .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,

diff --git a/src/amd/vulkan/radv_buffer.c b/src/amd/vulkan/radv_buffer.c
index 4307996..b83de23 100644 (file)
--- a/src/amd/vulkan/radv_buffer.c
+++ b/src/amd/vulkan/radv_buffer.c
@@ -28,6 +28,7 @@
 #include "radv_private.h"
 
 #include "vk_buffer.h"
+#include "vk_common_entrypoints.h"
 
 void
 radv_buffer_init(struct radv_buffer *buffer, struct radv_device *device,
@@ -155,7 +156,7 @@ radv_BindBufferMemory2(VkDevice _device, uint32_t bindInfoCount,
             .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
          };
 
-         radv_GetBufferMemoryRequirements2(_device, &info, &reqs);
+         vk_common_GetBufferMemoryRequirements2(_device, &info, &reqs);
 
          if (pBindInfos[i].memoryOffset + reqs.memoryRequirements.size > mem->alloc_size) {
             return vk_errorf(device, VK_ERROR_UNKNOWN,
@@ -232,17 +233,6 @@ radv_get_buffer_memory_requirements(struct radv_device *device, VkDeviceSize siz
 }
 
 VKAPI_ATTR void VKAPI_CALL
-radv_GetBufferMemoryRequirements2(VkDevice _device, const VkBufferMemoryRequirementsInfo2 *pInfo,
-                                  VkMemoryRequirements2 *pMemoryRequirements)
-{
-   RADV_FROM_HANDLE(radv_device, device, _device);
-   RADV_FROM_HANDLE(radv_buffer, buffer, pInfo->buffer);
-
-   radv_get_buffer_memory_requirements(device, buffer->vk.size, buffer->vk.create_flags,
-                                       buffer->vk.usage, pMemoryRequirements);
-}
-
-VKAPI_ATTR void VKAPI_CALL
 radv_GetDeviceBufferMemoryRequirements(VkDevice _device,
                                        const VkDeviceBufferMemoryRequirements *pInfo,
                                        VkMemoryRequirements2 *pMemoryRequirements)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 8895b89..feaa5ac 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -345,7 +345,7 @@ radv_device_init_vrs_state(struct radv_device *device)
    VkMemoryRequirements2 mem_req = {
       .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
    };
-   radv_GetBufferMemoryRequirements2(radv_device_to_handle(device), &info, &mem_req);
+   vk_common_GetBufferMemoryRequirements2(radv_device_to_handle(device), &info, &mem_req);
 
    VkMemoryAllocateInfo alloc_info = {
       .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,