Module: wine Branch: master Commit: 8c3c7d822d55371de5e9d026a5c5f4b8328d3d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c3c7d822d55371de5e9d026a...
Author: Zebediah Figura zfigura@codeweavers.com Date: Thu Mar 3 19:50:08 2022 -0600
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
---
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 <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"
-
Alexandre Julliard