From ef120460e7fa0f413fc091bc7b70604a66df75c0 Mon Sep 17 00:00:00 2001
From: Constantine Shablia <constantine.shablya@collabora.com>
Date: Thu, 7 Nov 2024 03:54:43 +0000
Subject: [PATCH] panvk: replace vkGetBufferMemoryRequirements2 with
 vkGetDeviceBufferMemoryRequirements

Mesa's Vulkan runtime will implement the former in terms of the
latter for us.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32361>
---
 src/panfrost/vulkan/panvk_buffer.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_buffer.c b/src/panfrost/vulkan/panvk_buffer.c
index b1a5d1ac027..7a8b8e503b3 100644
--- a/src/panfrost/vulkan/panvk_buffer.c
+++ b/src/panfrost/vulkan/panvk_buffer.c
@@ -29,14 +29,12 @@ panvk_GetBufferOpaqueCaptureAddress(VkDevice _device,
 }
 
 VKAPI_ATTR void VKAPI_CALL
-panvk_GetBufferMemoryRequirements2(VkDevice device,
-                                   const VkBufferMemoryRequirementsInfo2 *pInfo,
-                                   VkMemoryRequirements2 *pMemoryRequirements)
+panvk_GetDeviceBufferMemoryRequirements(VkDevice device,
+                                        const VkDeviceBufferMemoryRequirements *pInfo,
+                                        VkMemoryRequirements2 *pMemoryRequirements)
 {
-   VK_FROM_HANDLE(panvk_buffer, buffer, pInfo->buffer);
-
    const uint64_t align = 64;
-   const uint64_t size = align64(buffer->vk.size, align);
+   const uint64_t size = align64(pInfo->pCreateInfo->size, align);
 
    pMemoryRequirements->memoryRequirements.memoryTypeBits = 1;
    pMemoryRequirements->memoryRequirements.alignment = align;