From a929bafc775f7316b2e7a0a186610b8155d58ac5 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@collabora.com>
Date: Thu, 17 Mar 2022 16:31:02 -0500
Subject: [PATCH] panvk: Only implement Get*MemoryRequirements2

The runtime code will provide the 1.0 entrypoints for us.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15436>
---
 src/panfrost/vulkan/panvk_device.c | 47 +++++++++---------------------
 1 file changed, 13 insertions(+), 34 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c
index c2458eb22d0..df05c1652a4 100644
--- a/src/panfrost/vulkan/panvk_device.c
+++ b/src/panfrost/vulkan/panvk_device.c
@@ -1247,38 +1247,19 @@ panvk_InvalidateMappedMemoryRanges(VkDevice _device,
    return VK_SUCCESS;
 }
 
-void
-panvk_GetBufferMemoryRequirements(VkDevice _device,
-                                  VkBuffer _buffer,
-                                  VkMemoryRequirements *pMemoryRequirements)
-{
-   VK_FROM_HANDLE(panvk_buffer, buffer, _buffer);
-
-   pMemoryRequirements->memoryTypeBits = 1;
-   pMemoryRequirements->alignment = 64;
-   pMemoryRequirements->size =
-      MAX2(align64(buffer->size, pMemoryRequirements->alignment), buffer->size);
-}
-
 void
 panvk_GetBufferMemoryRequirements2(VkDevice device,
                                    const VkBufferMemoryRequirementsInfo2 *pInfo,
                                    VkMemoryRequirements2 *pMemoryRequirements)
 {
-   panvk_GetBufferMemoryRequirements(device, pInfo->buffer,
-                                     &pMemoryRequirements->memoryRequirements);
-}
+   VK_FROM_HANDLE(panvk_buffer, buffer, pInfo->buffer);
 
-void
-panvk_GetImageMemoryRequirements(VkDevice _device,
-                                 VkImage _image,
-                                 VkMemoryRequirements *pMemoryRequirements)
-{
-   VK_FROM_HANDLE(panvk_image, image, _image);
+   const uint64_t align = 64;
+   const uint64_t size = align64(buffer->size, align);
 
-   pMemoryRequirements->memoryTypeBits = 1;
-   pMemoryRequirements->size = panvk_image_get_total_size(image);
-   pMemoryRequirements->alignment = 4096;
+   pMemoryRequirements->memoryRequirements.memoryTypeBits = 1;
+   pMemoryRequirements->memoryRequirements.alignment = align;
+   pMemoryRequirements->memoryRequirements.size = size;
 }
 
 void
@@ -1286,16 +1267,14 @@ panvk_GetImageMemoryRequirements2(VkDevice device,
                                  const VkImageMemoryRequirementsInfo2 *pInfo,
                                  VkMemoryRequirements2 *pMemoryRequirements)
 {
-   panvk_GetImageMemoryRequirements(device, pInfo->image,
-                                    &pMemoryRequirements->memoryRequirements);
-}
+   VK_FROM_HANDLE(panvk_image, image, pInfo->image);
 
-void
-panvk_GetImageSparseMemoryRequirements(VkDevice device, VkImage image,
-                                       uint32_t *pSparseMemoryRequirementCount,
-                                       VkSparseImageMemoryRequirements *pSparseMemoryRequirements)
-{
-   panvk_stub();
+   const uint64_t align = 4096;
+   const uint64_t size = panvk_image_get_total_size(image);
+
+   pMemoryRequirements->memoryRequirements.memoryTypeBits = 1;
+   pMemoryRequirements->memoryRequirements.alignment = align;
+   pMemoryRequirements->memoryRequirements.size = size;
 }
 
 void