From 2cf590dd60708bbeed3c46922f0e0779508f03b3 Mon Sep 17 00:00:00 2001 From: Mike Lothian Date: Fri, 23 Aug 2024 17:13:21 +0100 Subject: [PATCH] Revert "device_select: shortcut EnumeratePhysicalDevice* for count-only calls" This reverts commit 86bb1036e2e40777a5cc913b15a093e4650d8cc3. This is causing crashes in the Vulkan backend of Chromium Signed-off-by: Mike Lothian Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11769 Part-of: --- src/vulkan/device-select-layer/device_select_layer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/vulkan/device-select-layer/device_select_layer.c b/src/vulkan/device-select-layer/device_select_layer.c index 5211ab6d3b1..ecbbaf40e14 100644 --- a/src/vulkan/device-select-layer/device_select_layer.c +++ b/src/vulkan/device-select-layer/device_select_layer.c @@ -558,10 +558,6 @@ static VkResult device_select_EnumeratePhysicalDevices(VkInstance instance, if (info->zink && info->xwayland) return info->EnumeratePhysicalDevices(instance, pPhysicalDeviceCount, pPhysicalDevices); VkResult result = info->EnumeratePhysicalDevices(instance, &physical_device_count, NULL); - if (!pPhysicalDevices) { - *pPhysicalDeviceCount = physical_device_count; - return result; - } VK_OUTARRAY_MAKE_TYPED(VkPhysicalDevice, out, pPhysicalDevices, pPhysicalDeviceCount); if (result != VK_SUCCESS) return result; @@ -647,10 +643,6 @@ static VkResult device_select_EnumeratePhysicalDeviceGroups(VkInstance instance, if (info->zink && info->xwayland) return info->EnumeratePhysicalDeviceGroups(instance, pPhysicalDeviceGroupCount, pPhysicalDeviceGroups); VkResult result = info->EnumeratePhysicalDeviceGroups(instance, &physical_device_group_count, NULL); - if (!pPhysicalDeviceGroups) { - *pPhysicalDeviceGroupCount = physical_device_group_count; - return result; - } VK_OUTARRAY_MAKE_TYPED(VkPhysicalDeviceGroupProperties, out, pPhysicalDeviceGroups, pPhysicalDeviceGroupCount); if (result != VK_SUCCESS)