ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winevulkan: Avoid goto in wine_vk_instance_load_physical_devices(). 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-03-29 14:53:55 +02:00 committed by Alexandre Julliard
parent 46bc42e7a7
commit a8c06b639e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/winevulkan/vulkan.c
View File

@ -341,7 +341,7 @@ static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src
static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *instance) static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *instance)
{ {
VkResult res; VkResult res;
struct VkPhysicalDevice_T **tmp_phys_devs = NULL; struct VkPhysicalDevice_T **tmp_phys_devs;
uint32_t num_phys_devs = 0; uint32_t num_phys_devs = 0;
unsigned int i; unsigned int i;
@ -362,13 +362,16 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst
res = instance->funcs.p_vkEnumeratePhysicalDevices(instance->instance, &num_phys_devs, tmp_phys_devs); res = instance->funcs.p_vkEnumeratePhysicalDevices(instance->instance, &num_phys_devs, tmp_phys_devs);
if (res != VK_SUCCESS) if (res != VK_SUCCESS)
goto err; {
heap_free(tmp_phys_devs);
return res;
}
instance->phys_devs = heap_calloc(num_phys_devs, sizeof(*instance->phys_devs)); instance->phys_devs = heap_calloc(num_phys_devs, sizeof(*instance->phys_devs));
if (!instance->phys_devs) if (!instance->phys_devs)
{ {
res = VK_ERROR_OUT_OF_HOST_MEMORY; heap_free(tmp_phys_devs);
goto err; return VK_ERROR_OUT_OF_HOST_MEMORY;
} }
/* Wrap each native physical device handle into a dispatchable object for the ICD loader. */ /* Wrap each native physical device handle into a dispatchable object for the ICD loader. */
@ -378,8 +381,8 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst
if (!phys_dev) if (!phys_dev)
{ {
ERR("Unable to allocate memory for physical device!\n"); ERR("Unable to allocate memory for physical device!\n");
res = VK_ERROR_OUT_OF_HOST_MEMORY; heap_free(tmp_phys_devs);
goto err; return VK_ERROR_OUT_OF_HOST_MEMORY;
} }
instance->phys_devs[i] = phys_dev; instance->phys_devs[i] = phys_dev;
@ -389,10 +392,6 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst
heap_free(tmp_phys_devs); heap_free(tmp_phys_devs);
return VK_SUCCESS; return VK_SUCCESS;
err:
heap_free(tmp_phys_devs);
return res;
} }
/* Helper function used for freeing an instance structure. This function supports full /* Helper function used for freeing an instance structure. This function supports full