4 Mar
2022
4 Mar
'22
1:50 a.m.
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(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 1c2cea6a6f3..40e3165ee80 100644 --- 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 "windef.h" +#include "dxgi1_6.h" +#include "d3d12.h" +#include "wine/vulkan.h" #include <vkd3d.h> -#include "dxgi1_6.h" #include "initguid.h" #include "wine/wined3d.h" -- 2.35.1