d3d12: Explicitly use Wine d3d12 and Vulkan headers.

Avoid depending on our modified copy of vkd3d.h to include Wine headers; this will not work with system vkd3d.h. Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3d12: Explicitly use Wine d3d12 and Vulkan headers.
8c3c7d82 · Zebediah Figura · Alexandre Julliard · 9951f2f4 · 8c3c7d82
Commit 8c3c7d82 authored Mar 03, 2022 by Zebediah Figura Committed by Alexandre Julliard Mar 04, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

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

No files found.
--- a/dlls/d3d12/d3d12_main.c
+++ b/dlls/d3d12/d3d12_main.c
@@ -18,9 +18,15 @@
 */

 #define COBJMACROS
+#define VKD3D_NO_VULKAN_H
+#define VKD3D_NO_WIN32_TYPES

-#include <vkd3d.h>
+#include "windef.h"
 #include "dxgi1_6.h"
+#include "d3d12.h"
+#include "wine/vulkan.h"
+
+#include <vkd3d.h>

 #include "initguid.h"
 #include "wine/wined3d.h"