wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Simplify error handling in vkd3d_create_vk_device().

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-09-27 13:30:49 +02:00 committed by Alexandre Julliard
parent 8378ec758d
commit 873a26a061
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libs/vkd3d/device.c
View File

@ -998,9 +998,9 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
uint32_t direct_queue_timestamp_bits, copy_queue_timestamp_bits, compute_queue_timestamp_bits; uint32_t direct_queue_timestamp_bits, copy_queue_timestamp_bits, compute_queue_timestamp_bits;
unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index;
const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs;
VkQueueFamilyProperties *queue_properties; VkQueueFamilyProperties *queue_properties = NULL;
VkDeviceQueueCreateInfo *queue_info = NULL;
VkPhysicalDeviceFeatures device_features; VkPhysicalDeviceFeatures device_features;
VkDeviceQueueCreateInfo *queue_info;
VkPhysicalDevice physical_device; VkPhysicalDevice physical_device;
VkDeviceCreateInfo device_info; VkDeviceCreateInfo device_info;
uint32_t queue_family_count; uint32_t queue_family_count;
@ -1027,8 +1027,8 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
if (!(queue_info = vkd3d_calloc(queue_family_count, sizeof(*queue_info)))) if (!(queue_info = vkd3d_calloc(queue_family_count, sizeof(*queue_info))))
{ {
vkd3d_free(queue_properties); hr = E_OUTOFMEMORY;
return E_OUTOFMEMORY; goto fail;
} }
direct_queue_family_index = ~0u; direct_queue_family_index = ~0u;
@ -1066,19 +1066,18 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
compute_queue_timestamp_bits = queue_properties[i].timestampValidBits; compute_queue_timestamp_bits = queue_properties[i].timestampValidBits;
} }
} }
vkd3d_free(queue_properties);
if (direct_queue_family_index == ~0u) if (direct_queue_family_index == ~0u)
{ {
FIXME("Could not find a suitable queue family for a direct command queue.\n"); FIXME("Could not find a suitable queue family for a direct command queue.\n");
vkd3d_free(queue_info); hr = E_FAIL;
return E_FAIL; goto fail;
} }
if (copy_queue_family_index == ~0u) if (copy_queue_family_index == ~0u)
{ {
FIXME("Could not find a suitable queue family for a copy command queue.\n"); FIXME("Could not find a suitable queue family for a copy command queue.\n");
vkd3d_free(queue_info); hr = E_FAIL;
return E_FAIL; goto fail;
} }
if (compute_queue_family_index == ~0u) if (compute_queue_family_index == ~0u)
{ {
@ -1096,15 +1095,12 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features));
device->vk_physical_device = physical_device; device->vk_physical_device = physical_device;
if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count)))
{ goto fail;
vkd3d_free(queue_info);
return E_FAIL;
}
if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions))))
{ {
vkd3d_free(queue_info); hr = E_OUTOFMEMORY;
return E_OUTOFMEMORY; goto fail;
} }
/* Create device */ /* Create device */
@ -1125,7 +1121,6 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device)); vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device));
vkd3d_free(extensions); vkd3d_free(extensions);
vkd3d_free(queue_info);
if (vr < 0) if (vr < 0)
{ {
ERR("Failed to create Vulkan device, vr %d.\n", vr); ERR("Failed to create Vulkan device, vr %d.\n", vr);
@ -1137,7 +1132,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
ERR("Failed to load device procs, hr %#x.\n", hr); ERR("Failed to load device procs, hr %#x.\n", hr);
if (device->vk_procs.vkDestroyDevice) if (device->vk_procs.vkDestroyDevice)
device->vk_procs.vkDestroyDevice(vk_device, NULL); device->vk_procs.vkDestroyDevice(vk_device, NULL);
return hr; goto fail;
} }
device->vk_device = vk_device; device->vk_device = vk_device;
@ -1149,12 +1144,17 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
{ {
ERR("Failed to create queues, hr %#x.\n", hr); ERR("Failed to create queues, hr %#x.\n", hr);
device->vk_procs.vkDestroyDevice(vk_device, NULL); device->vk_procs.vkDestroyDevice(vk_device, NULL);
return hr; goto fail;
} }
TRACE("Created Vulkan device %p.\n", vk_device); TRACE("Created Vulkan device %p.\n", vk_device);
return S_OK; fail:
if (queue_properties)
vkd3d_free(queue_properties);
if (queue_info)
vkd3d_free(queue_info);
return hr;
} }
static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device)