Józef Kucia : winevulkan: Introduce WINE_VK_HOST to explicitly request 'host' Vulkan headers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e6e7976d66e3de75098f5878176326865955dc1e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e6e7976d66e3de75098f58781...

Author: Józef Kucia 
Date:   Fri Jun  1 13:10:22 2018 +0200

winevulkan: Introduce WINE_VK_HOST to explicitly request 'host' Vulkan headers.

Signed-off-by: Józef Kucia 
Signed-off-by: Alexandre Julliard

---

dlls/d3d12/d3d12_main.c     | 2 +-
 dlls/dxgi/swapchain.c       | 3 +--
 dlls/winevulkan/make_vulkan | 7 ++++++-
 dlls/winex11.drv/vulkan.c   | 3 +--
 include/wine/vulkan.h       | 7 ++++++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c
index 91525b4..be0bd7a 100644
--- a/dlls/d3d12/d3d12_main.c
+++ b/dlls/d3d12/d3d12_main.c
@@ -23,7 +23,7 @@
 #define VK_NO_PROTOTYPES
 #define VKD3D_NO_VULKAN_H
 #define VKD3D_NO_WIN32_TYPES
-#define WINE_VK_ALIGN(x)
+#define WINE_VK_HOST

#include "wine/debug.h"
 #include "wine/heap.h"
diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 7f550c4..fb91eec 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -24,11 +24,10 @@

#ifdef SONAME_LIBVKD3D
 #define VK_NO_PROTOTYPES
-#define VKAPI_CALL
 #define VKD3D_NO_PROTOTYPES
 #define VKD3D_NO_VULKAN_H
 #define VKD3D_NO_WIN32_TYPES
-#define WINE_VK_ALIGN(x)
+#define WINE_VK_HOST
 #include "wine/library.h"
 #include "wine/vulkan.h"
 #include "wine/vulkan_driver.h"
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index f0583b4..2265ddc 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -2009,6 +2009,12 @@ class VkGenerator(object):
         f.write("#include <windef.h>\n")
         f.write("#include <stdint.h>\n\n")

+        f.write("/* Define WINE_VK_HOST to get 'host' headers. */\n")
+        f.write("#ifdef WINE_VK_HOST\n")
+        f.write("#define VKAPI_CALL\n")
+        f.write('#define WINE_VK_ALIGN(x)\n')
+        f.write("#endif\n\n")
+
         f.write("#ifndef VKAPI_CALL\n")
         f.write("#define VKAPI_CALL __stdcall\n")
         f.write("#endif\n\n")
@@ -2017,7 +2023,6 @@ class VkGenerator(object):
         f.write("#define VKAPI_PTR VKAPI_CALL\n")
         f.write("#endif\n\n")

-        f.write("/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */\n")
         f.write("#ifndef WINE_VK_ALIGN\n")
         f.write("#define WINE_VK_ALIGN DECLSPEC_ALIGN\n")
         f.write("#endif\n\n")
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
index a72be33..7e25232 100644
--- a/dlls/winex11.drv/vulkan.c
+++ b/dlls/winex11.drv/vulkan.c
@@ -31,9 +31,8 @@
 #include "wine/library.h"
 #include "x11drv.h"

-/* We only want host compatible structures and don't need alignment. */
-#define WINE_VK_ALIGN(x)
 #define VK_NO_PROTOTYPES
+#define WINE_VK_HOST

#include "wine/vulkan.h"
 #include "wine/vulkan_driver.h"
diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h
index 7c938cd..d44687f 100644
--- a/include/wine/vulkan.h
+++ b/include/wine/vulkan.h
@@ -6,6 +6,12 @@
 #include <windef.h>
 #include <stdint.h>

+/* Define WINE_VK_HOST to get 'host' headers. */
+#ifdef WINE_VK_HOST
+#define VKAPI_CALL
+#define WINE_VK_ALIGN(x)
+#endif
+
 #ifndef VKAPI_CALL
 #define VKAPI_CALL __stdcall
 #endif
@@ -14,7 +20,6 @@
 #define VKAPI_PTR VKAPI_CALL
 #endif

-/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */
 #ifndef WINE_VK_ALIGN
 #define WINE_VK_ALIGN DECLSPEC_ALIGN
 #endif