system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 20:06:18 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-06-01 13:10:22 +02:00 committed by Alexandre Julliard
parent a77b93c4d7
commit e6e7976d66
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d12/d3d12_main.c
View File

@ -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"

3
dlls/dxgi/swapchain.c
View File

@ -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"

7
dlls/winevulkan/make_vulkan
View File

@ -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")

3
dlls/winex11.drv/vulkan.c
View File

@ -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"

7
include/wine/vulkan.h
View File

@ -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