ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Zebediah Figura 2022-03-03 19:50:08 -06:00 committed by Alexandre Julliard
parent 9951f2f433
commit 8c3c7d822d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3d12/d3d12_main.c
View File

@ -18,9 +18,15 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define VKD3D_NO_VULKAN_H
#define VKD3D_NO_WIN32_TYPES
#include "windef.h"
#include "dxgi1_6.h"
#include "d3d12.h"
#include "wine/vulkan.h"
#include <vkd3d.h> #include <vkd3d.h>
#include "dxgi1_6.h"
#include "initguid.h" #include "initguid.h"
#include "wine/wined3d.h" #include "wine/wined3d.h"