d3d12: Check for VK_KHR_external_memory_capabilities before using VkPhysicalDeviceIDProperties.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3d12: Check for VK_KHR_external_memory_capabilities before using VkPhysicalDeviceIDProperties.
b8f8ed10 · Zebediah Figura · Alexandre Julliard · c88b2ed3 · b8f8ed10
Commit b8f8ed10 authored Feb 25, 2021 by Zebediah Figura Committed by Alexandre Julliard Feb 26, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

d3d12_main.c dlls/d3d12/d3d12_main.c +4 -1

No files found.
--- a/dlls/d3d12/d3d12_main.c
+++ b/dlls/d3d12/d3d12_main.c
@@ -265,7 +265,9 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst
    if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices)) < 0)
        goto done;

-    if (!IsEqualGUID(&adapter_info->driver_uuid, &GUID_NULL) && pfn_vkGetPhysicalDeviceProperties2)
+    if (!IsEqualGUID(&adapter_info->driver_uuid, &GUID_NULL) && pfn_vkGetPhysicalDeviceProperties2
+            && check_vk_instance_extension(vk_instance, pfn_vkGetInstanceProcAddr,
+                    VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME))
    {
        TRACE("Matching adapters by UUIDs.\n");

@@ -331,6 +333,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe
    };
    static const char * const optional_instance_extensions[] =
    {
+        VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME,
        VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
    };
    static const char * const device_extensions[] =