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 <zzyiwei@chromium.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
Tested-by: Mark Janes <markjanes@swizzler.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16694>
diff --git a/src/vulkan/runtime/vk_physical_device.c b/src/vulkan/runtime/vk_physical_device.c
index 2b747a0..4f36779 100644
--- a/src/vulkan/runtime/vk_physical_device.c
+++ b/src/vulkan/runtime/vk_physical_device.c
@@ -173,21 +173,7 @@
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
