system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

winevulkan: Simplify wine_vk_instance_free helper.

Browse source
This commit is contained in:
Rémi Bernon 2024-03-13 18:44:39 +01:00 committed by Alexandre Julliard
parent 04981ad759
commit 81ed2e5465
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/winevulkan/vulkan.c
View file

@ -684,17 +684,11 @@ static void wine_vk_instance_free(struct wine_instance *instance)
{
unsigned int i;
if (!instance)
return;
for (i = 0; i < instance->phys_dev_count; i++)
wine_phys_dev_cleanup(&instance->phys_devs[i]);
if (instance->host_instance)
{
vk_funcs->p_vkDestroyInstance(instance->host_instance, NULL /* allocator */);
remove_handle_mapping(instance, &instance->wrapper_entry);
}
vk_funcs->p_vkDestroyInstance(instance->host_instance, NULL /* allocator */);
remove_handle_mapping(instance, &instance->wrapper_entry);
pthread_rwlock_destroy(&instance->wrapper_lock);
free(instance->utils_messengers);
@ -846,8 +840,6 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,
ERR("Failed to allocate memory for instance\n");
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
rb_init(&object->wrappers, wrapper_entry_compare);
pthread_rwlock_init(&object->wrapper_lock, NULL);
init_conversion_context(&ctx);
res = wine_vk_instance_convert_create_info(&ctx, create_info, &create_info_host, object);
@ -857,10 +849,14 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,
if (res != VK_SUCCESS)
{
ERR("Failed to create instance, res=%d\n", res);
wine_vk_instance_free(object);
free(object->utils_messengers);
free(object);
return res;
}
rb_init(&object->wrappers, wrapper_entry_compare);
pthread_rwlock_init(&object->wrapper_lock, NULL);
object->handle = client_instance;
add_handle_mapping_ptr(object, object->handle, object->host_instance, &object->wrapper_entry);
@ -929,6 +925,8 @@ void wine_vkDestroyInstance(VkInstance handle, const VkAllocationCallbacks *allo
if (allocator)
FIXME("Support allocation allocators\n");
if (!instance)
return;
wine_vk_instance_free(instance);
}