From cdd1588d55c95a13a70d381ef09376e5e1a0d88e Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Thu, 26 Jan 2023 08:01:58 -0800 Subject: [PATCH] dzn: Don't recursively lock the physical device enum mutex Fixes: cfa260cd274 ("dzn: Use common physical device list/enumeration helpers") Part-of: --- src/microsoft/vulkan/dzn_device.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c index d6be48f7d0e..10ecfb5184a 100644 --- a/src/microsoft/vulkan/dzn_device.c +++ b/src/microsoft/vulkan/dzn_device.c @@ -1106,20 +1106,12 @@ dzn_instance_add_physical_device(struct vk_instance *instance, static VkResult dzn_enumerate_physical_devices(struct vk_instance *instance) { - VkResult result = VK_SUCCESS; - - mtx_lock(&instance->physical_devices.mutex); - if (!instance->physical_devices.enumerated) { - result = dzn_enumerate_physical_devices_dxcore(instance); + VkResult result = dzn_enumerate_physical_devices_dxcore(instance); #ifdef _WIN32 - if (result != VK_SUCCESS) - result = dzn_enumerate_physical_devices_dxgi(instance); + if (result != VK_SUCCESS) + result = dzn_enumerate_physical_devices_dxgi(instance); #endif - if (result == VK_SUCCESS) - instance->physical_devices.enumerated = true; - } - mtx_unlock(&instance->physical_devices.mutex); - + return result; }