OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dzn: Don't recursively lock the physical device enum mutex

Browse Source 
Fixes: cfa260cd27 ("dzn: Use common physical device list/enumeration helpers")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20939>
This commit is contained in:
Jesse Natalie
2023-01-26 08:01:58 -08:00
committed by Marge Bot
parent 40a2b50599
commit cdd1588d55
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/microsoft/vulkan/dzn_device.c
View File

@@ -1106,20 +1106,12 @@ dzn_instance_add_physical_device(struct vk_instance *instance,
static VkResult static VkResult
dzn_enumerate_physical_devices(struct vk_instance *instance) dzn_enumerate_physical_devices(struct vk_instance *instance)
{ {
VkResult result = VK_SUCCESS; VkResult result = dzn_enumerate_physical_devices_dxcore(instance);
mtx_lock(&instance->physical_devices.mutex);
if (!instance->physical_devices.enumerated) {
result = dzn_enumerate_physical_devices_dxcore(instance);
#ifdef _WIN32 #ifdef _WIN32
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
result = dzn_enumerate_physical_devices_dxgi(instance); result = dzn_enumerate_physical_devices_dxgi(instance);
#endif #endif
if (result == VK_SUCCESS)
instance->physical_devices.enumerated = true;
}
mtx_unlock(&instance->physical_devices.mutex);
return result; return result;
} }