=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: tests: Use vkd3d_optional_device_extensions_info.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 0eb2817c226b2694ff1a07aba136a8664de8f47b
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=0eb2817c226b2694ff1a07aba136a8664de8f47b

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Apr  2 12:15:55 2019 +0200

tests: Use vkd3d_optional_device_extensions_info.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tests/d3d12_crosstest.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h
index 723659e..2103caf 100644
--- a/tests/d3d12_crosstest.h
+++ b/tests/d3d12_crosstest.h
@@ -455,29 +455,30 @@ static VkPhysicalDevice select_physical_device(struct vkd3d_instance *instance)
 static HRESULT create_vkd3d_device(struct vkd3d_instance *instance,
         D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device)
 {
-    struct vkd3d_device_create_info device_create_info;
-    VkPhysicalDevice vk_physical_device;
-
     static const char * const device_extensions[] =
     {
         VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME,
     };
+    static const struct vkd3d_optional_device_extensions_info optional_extensions =
+    {
+        .type = VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO,
+        .extensions = device_extensions,
+        .extension_count = ARRAY_SIZE(device_extensions),
+    };
+
+    struct vkd3d_device_create_info device_create_info;
+    VkPhysicalDevice vk_physical_device;
 
     if (!(vk_physical_device = select_physical_device(instance)))
         return E_INVALIDARG;
 
     memset(&device_create_info, 0, sizeof(device_create_info));
     device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
+    device_create_info.next = &optional_extensions;
     device_create_info.minimum_feature_level = minimum_feature_level;
     device_create_info.instance = instance;
     device_create_info.vk_physical_device = vk_physical_device;
 
-    if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME))
-    {
-        device_create_info.device_extensions = device_extensions;
-        device_create_info.device_extension_count = ARRAY_SIZE(device_extensions);
-    }
-
     return vkd3d_create_device(&device_create_info, iid, device);
 }