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 | 4 ++++ dlls/win32u/vulkan.c | 5 ----- 3 files changed, 4 insertions(+), 7 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..bef1ab0bcfa 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -26,7 +26,11 @@ #include "shellapi.h" #include "shlobj.h" #include "wine/list.h" + +#define VK_NO_PROTOTYPES +#define WINE_VK_HOST #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;