Revert "device_select: shortcut EnumeratePhysicalDevice* for count-only calls"

This reverts commit 86bb1036e2.

This is causing crashes in the Vulkan backend of Chromium

Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11769
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30820>
This commit is contained in:
Mike Lothian 2024-08-23 17:13:21 +01:00 committed by Marge Bot
parent 9e04c0a818
commit 2cf590dd60

View file

@ -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)