Skip to content
Snippets Groups Projects
Commit 826b7572 authored by Giovanni Mascellani's avatar Giovanni Mascellani Committed by Alexandre Julliard
Browse files

vkd3d: Do not automatically succeed if no extensions are available.

So error messages for missing required extensions are emitted.
parent dbe33846
No related branches found
No related tags found
1 merge request!852vkd3d: Only request properties and features when the corresponding extension is available.
...@@ -424,8 +424,6 @@ static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, ...@@ -424,8 +424,6 @@ static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance,
ERR("Failed to enumerate instance extensions, vr %d.\n", vr); ERR("Failed to enumerate instance extensions, vr %d.\n", vr);
return hresult_from_vk_result(vr); return hresult_from_vk_result(vr);
} }
if (!count)
return S_OK;
if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions)))) if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions))))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
...@@ -1534,8 +1532,6 @@ static HRESULT vkd3d_check_device_extensions(struct d3d12_device *device, ...@@ -1534,8 +1532,6 @@ static HRESULT vkd3d_check_device_extensions(struct d3d12_device *device,
ERR("Failed to enumerate device extensions, vr %d.\n", vr); ERR("Failed to enumerate device extensions, vr %d.\n", vr);
return hresult_from_vk_result(vr); return hresult_from_vk_result(vr);
} }
if (!*vk_extension_count)
return S_OK;
if (!(*vk_extensions = vkd3d_calloc(*vk_extension_count, sizeof(**vk_extensions)))) if (!(*vk_extensions = vkd3d_calloc(*vk_extension_count, sizeof(**vk_extensions))))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment