Józef Kucia : libs/vkd3d-utils: Enable swapchain extensions in D3D12CreateDevice().

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Wed Jan 24 14:33:35 2018 +0100

libs/vkd3d-utils: Enable swapchain extensions in D3D12CreateDevice().

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

---

 libs/vkd3d-utils/vkd3d_utils_main.c    | 26 ++++++++++++++++++++------
 libs/vkd3d-utils/vkd3d_utils_private.h |  3 +++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c
index fb4344e..4537de0 100644
--- a/libs/vkd3d-utils/vkd3d_utils_main.c
+++ b/libs/vkd3d-utils/vkd3d_utils_main.c
@@ -18,21 +18,31 @@
 
 #include "vkd3d_utils_private.h"
 
-HRESULT WINAPI D3D12GetDebugInterface(REFIID riid, void **debug)
+HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug)
 {
-    FIXME("riid %s, debug %p stub!\n", debugstr_guid(riid), debug);
+    FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug);
 
     return E_NOTIMPL;
 }
 
 HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter,
-        D3D_FEATURE_LEVEL minimum_feature_level, REFIID riid, void **device)
+        D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device)
 {
     struct vkd3d_instance_create_info instance_create_info;
     struct vkd3d_device_create_info device_create_info;
 
-    TRACE("adapter %p, minimum_feature_level %#x, riid %s, device %p.\n",
-            adapter, minimum_feature_level, debugstr_guid(riid), device);
+    static const char * const instance_extensions[] =
+    {
+        VK_KHR_SURFACE_EXTENSION_NAME,
+        VK_KHR_XCB_SURFACE_EXTENSION_NAME,
+    };
+    static const char * const device_extensions[] =
+    {
+        VK_KHR_SWAPCHAIN_EXTENSION_NAME,
+    };
+
+    TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p.\n",
+            adapter, minimum_feature_level, debugstr_guid(iid), device);
 
     if (adapter)
         FIXME("Ignoring adapter %p.\n", adapter);
@@ -40,12 +50,16 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter,
     memset(&instance_create_info, 0, sizeof(instance_create_info));
     instance_create_info.signal_event_pfn = vkd3d_signal_event;
     instance_create_info.wchar_size = sizeof(WCHAR);
+    instance_create_info.instance_extensions = instance_extensions;
+    instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions);
 
     memset(&device_create_info, 0, sizeof(device_create_info));
     device_create_info.minimum_feature_level = minimum_feature_level;
     device_create_info.instance_create_info = &instance_create_info;
+    device_create_info.device_extensions = device_extensions;
+    device_create_info.device_extension_count = ARRAY_SIZE(device_extensions);
 
-    return vkd3d_create_device(&device_create_info, riid, device);
+    return vkd3d_create_device(&device_create_info, iid, device);
 }
 
 HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size,
diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h
index d4a89ee..6aa0df6 100644
--- a/libs/vkd3d-utils/vkd3d_utils_private.h
+++ b/libs/vkd3d-utils/vkd3d_utils_private.h
@@ -19,6 +19,9 @@
 #ifndef __VKD3D_UTILS_PRIVATE_H
 #define __VKD3D_UTILS_PRIVATE_H
 
+#define VK_NO_PROTOTYPES
+#define VK_USE_PLATFORM_XCB_KHR
+
 #include <pthread.h>
 #include <vkd3d.h>