AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: Clean up try_create_physical_device error handling

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-01-30 20:11:54 -06:00
committed by Marge Bot
parent 673bb5c8b7
commit 6d1babc9a0
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_physical_device.c
+5 -8
View File
@@ -346,10 +346,8 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
&supported_extensions, NULL,
&dispatch_table);
if (result != VK_SUCCESS) {
vk_error(instance, result);
if (result != VK_SUCCESS)
goto fail_alloc;
}
device->instance = instance;
device->dev = ndev;
@@ -384,19 +382,18 @@ nvk_physical_device_try_create(struct nvk_instance *instance,
device->vk.supported_sync_types = device->sync_types;
result = nvk_init_wsi(device);
if (result != VK_SUCCESS) {
vk_error(instance, result);
goto fail_alloc;
}
if (result != VK_SUCCESS)
goto fail_init;
*device_out = device;
close(fd);
return VK_SUCCESS;
fail_init:
vk_physical_device_finish(&device->vk);
fail_alloc:
vk_free(&instance->vk.alloc, device);
fail_dev_alloc:
nouveau_ws_device_destroy(ndev);
return result;