From a19e1f338e6cc257808d97aaa80fecb0a9651adc Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Tue, 24 May 2022 16:39:12 +0000 Subject: [PATCH] vulkan: remove the VkPhysicalDeviceMemoryProperties workaround cts fix landed in vulkan-cts-1.2.5 while mesa CI has bumped once. Signed-off-by: Yiwei Zhang Reviewed-by: Jason Ekstrand Reviewed-by: Chad Versace Tested-by: Mark Janes Part-of: --- src/vulkan/runtime/vk_physical_device.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/vulkan/runtime/vk_physical_device.c b/src/vulkan/runtime/vk_physical_device.c index 2b747a0cb60..4f36779ee1f 100644 --- a/src/vulkan/runtime/vk_physical_device.c +++ b/src/vulkan/runtime/vk_physical_device.c @@ -173,21 +173,7 @@ vk_common_GetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice, pdevice->dispatch_table.GetPhysicalDeviceMemoryProperties2(physicalDevice, &props2); - /* dEQP-VK.api.info.get_physical_device_properties2.memory_properties memsets - * the struct to 0xcd and expects that the unused array elements are - * untouched. - */ - pMemoryProperties->memoryHeapCount = props2.memoryProperties.memoryHeapCount; - for (int i = 0; i < pMemoryProperties->memoryHeapCount; i++) { - pMemoryProperties->memoryHeaps[i].flags = props2.memoryProperties.memoryHeaps[i].flags; - pMemoryProperties->memoryHeaps[i].size = props2.memoryProperties.memoryHeaps[i].size; - } - - pMemoryProperties->memoryTypeCount = props2.memoryProperties.memoryTypeCount; - for (int i = 0; i < pMemoryProperties->memoryTypeCount; i++) { - pMemoryProperties->memoryTypes[i].heapIndex = props2.memoryProperties.memoryTypes[i].heapIndex; - pMemoryProperties->memoryTypes[i].propertyFlags = props2.memoryProperties.memoryTypes[i].propertyFlags; - } + *pMemoryProperties = props2.memoryProperties; } VKAPI_ATTR void VKAPI_CALL