Mesa (main): radv: remove VkPhysicalDeviceMemoryProperties2 workaround

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 229538d6daf21e6999e7600427c621ca6745fc00
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=229538d6daf21e6999e7600427c621ca6745fc00

Author: Yiwei Zhang <zzyiwei at chromium.org>
Date:   Tue May 24 16:41:45 2022 +0000

radv: remove VkPhysicalDeviceMemoryProperties2 workaround

This reverts 03888bf09c0dce42d1857f3c7acbb86715837198

Signed-off-by: Yiwei Zhang <zzyiwei at chromium.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16694>

---

 src/amd/vulkan/radv_device.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 1edc2ab990f..a13fe232e77 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -2620,21 +2620,7 @@ radv_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice,
 {
    RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice);
 
-   pMemoryProperties->memoryProperties.memoryTypeCount = pdevice->memory_properties.memoryTypeCount;
-   for (uint32_t i = 0; i < pdevice->memory_properties.memoryTypeCount; i++) {
-      pMemoryProperties->memoryProperties.memoryTypes[i] = (VkMemoryType) {
-         .propertyFlags = pdevice->memory_properties.memoryTypes[i].propertyFlags,
-         .heapIndex     = pdevice->memory_properties.memoryTypes[i].heapIndex,
-      };
-   }
-
-   pMemoryProperties->memoryProperties.memoryHeapCount = pdevice->memory_properties.memoryHeapCount;
-   for (uint32_t i = 0; i < pdevice->memory_properties.memoryHeapCount; i++) {
-      pMemoryProperties->memoryProperties.memoryHeaps[i] = (VkMemoryHeap) {
-         .size    = pdevice->memory_properties.memoryHeaps[i].size,
-         .flags   = pdevice->memory_properties.memoryHeaps[i].flags,
-      };
-   }
+   pMemoryProperties->memoryProperties = pdevice->memory_properties;
 
    VkPhysicalDeviceMemoryBudgetPropertiesEXT *memory_budget =
       vk_find_struct(pMemoryProperties->pNext, PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT);