From: Aida Jonikienė aidas957@gmail.com
The alignment of some Vulkan structs doesn't match the winevulkan Unix library otherwise (causing strange segfaults on 32-bit). --- dlls/win32u/d3dkmt.c | 2 -- dlls/win32u/ntuser_private.h | 1 + dlls/win32u/vulkan.c | 5 ----- dlls/winemac.drv/vulkan.c | 3 --- dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan_private.h | 3 --- dlls/winewayland.drv/vulkan.c | 3 --- dlls/winex11.drv/vulkan.c | 3 --- dlls/winex11.drv/x11drv_main.c | 3 --- dlls/winex11.drv/xrandr.c | 3 --- include/wine/vulkan.h | 4 ++-- include/wine/vulkan_driver.h | 1 - 12 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/dlls/win32u/d3dkmt.c b/dlls/win32u/d3dkmt.c index 15b0b870b56..24a668a85b4 100644 --- a/dlls/win32u/d3dkmt.c +++ b/dlls/win32u/d3dkmt.c @@ -29,8 +29,6 @@ #include "ntgdi_private.h" #include "win32u_private.h" #include "ntuser_private.h" -#include "wine/vulkan.h" -#include "wine/vulkan_driver.h"
WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6cc47dcada4..f7a3460a0a6 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -27,6 +27,7 @@ #include "shlobj.h" #include "wine/list.h" #include "wine/vulkan.h" +#include "wine/vulkan_driver.h"
#define WM_POPUPSYSTEMMENU 0x0313 diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index ae6ab974a53..c676ae10e54 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -32,11 +32,6 @@ #include "win32u_private.h" #include "ntuser_private.h"
-#define VK_NO_PROTOTYPES -#define WINE_VK_HOST -#include "wine/vulkan.h" -#include "wine/vulkan_driver.h" - WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr = NULL; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 08c4ac3bba8..8b375b6a53c 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -36,9 +36,6 @@ #include "macdrv.h" #include "wine/debug.h"
-#define VK_NO_PROTOTYPES -#define WINE_VK_HOST - #include "wine/vulkan.h" #include "wine/vulkan_driver.h"
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 95f7b31586c..1ec76e23d02 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3029,8 +3029,8 @@ 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("#ifdef WINE_UNIX_LIB\n") + f.write("#define VK_NO_PROTOTYPES\n") f.write("#define VKAPI_CALL\n") f.write('#define WINE_VK_ALIGN(x)\n') f.write("#endif\n\n") diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 87e12c63b2b..59b900930b3 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -20,9 +20,6 @@ #ifndef __WINE_VULKAN_PRIVATE_H #define __WINE_VULKAN_PRIVATE_H
-#define WINE_VK_HOST -#define VK_NO_PROTOTYPES - #include <pthread.h>
#include "vulkan_loader.h" diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 937814d0c8a..3ac23676f0d 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -32,9 +32,6 @@ #include "waylanddrv.h" #include "wine/debug.h"
-#define VK_NO_PROTOTYPES -#define WINE_VK_HOST - #include "wine/vulkan.h" #include "wine/vulkan_driver.h"
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index e1ac9ede8fe..12f51fdcefd 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -39,9 +39,6 @@ #include "x11drv.h" #include "xcomposite.h"
-#define VK_NO_PROTOTYPES -#define WINE_VK_HOST - #include "wine/vulkan.h" #include "wine/vulkan_driver.h"
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e441298c9aa..86867abf9f9 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -44,9 +44,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS
-#define VK_NO_PROTOTYPES -#define WINE_VK_HOST - #include "x11drv.h" #include "winreg.h" #include "xcomposite.h" diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 8333c4e2c5b..48b579e87e3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -42,9 +42,6 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
#ifdef SONAME_LIBXRANDR
-#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 867ea4c3bc7..7b5d8b1f9a4 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -21,8 +21,8 @@ #include <windef.h> #include <stdint.h>
-/* Define WINE_VK_HOST to get 'host' headers. */ -#ifdef WINE_VK_HOST +#ifdef WINE_UNIX_LIB +#define VK_NO_PROTOTYPES #define VKAPI_CALL #define WINE_VK_ALIGN(x) #endif diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 4bd60218943..4b4908f201e 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -42,7 +42,6 @@ struct vulkan_client_object
#ifdef WINE_UNIX_LIB
-#define WINE_VK_HOST #include "wine/vulkan.h" #include "wine/rbtree.h"