Skip to content

W
wine-winehq
Commit 8c3c7d82 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

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: 's avatarZebediah Figura <zfigura@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 9951f2f4
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
dlls/d3d12/d3d12_main.c
View file @ 8c3c7d82
...@@ -18,9 +18,15 @@ ...@@ -18,9 +18,15 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define VKD3D_NO_VULKAN_H
#define VKD3D_NO_WIN32_TYPES
#include <vkd3d.h> #include "windef.h"
#include "dxgi1_6.h" #include "dxgi1_6.h"
#include "d3d12.h"
#include "wine/vulkan.h"
#include <vkd3d.h>
#include "initguid.h" #include "initguid.h"
#include "wine/wined3d.h" #include "wine/wined3d.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment