Module: wine Branch: master Commit: 68bb2f62e9b153a61f0f7f14a8fe0b954710f2cd URL: https://gitlab.winehq.org/wine/wine/-/commit/68bb2f62e9b153a61f0f7f14a8fe0b9...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Jul 25 22:08:03 2022 +0200
winevulkan: Remove __wine_get_vulkan_driver PE entry point.
---
dlls/win32u/gdiobj.c | 1 - dlls/win32u/vulkan.c | 8 +++++--- dlls/win32u/win32u.spec | 3 --- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 2 +- dlls/winevulkan/vulkan_loader.h | 1 - include/wine/gdi_driver.h | 1 - include/wine/vulkan_driver.h | 4 ++-- 10 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index cb5297c5676..aaeed2ba676 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1149,7 +1149,6 @@ static struct unix_funcs unix_funcs = __wine_get_brush_bitmap_info, __wine_get_file_outline_text_metric, __wine_get_icm_profile, - __wine_get_vulkan_driver, __wine_get_wgl_driver, __wine_send_input, }; diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 8f85f4e4632..c66be5bc7ed 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -22,12 +22,14 @@ #pragma makedep unix #endif
-#include "ntgdi_private.h" +#include "win32u_private.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h"
/*********************************************************************** - * __wine_get_vulkan_driver (win32u.@) + * __wine_get_vulkan_driver (win32u.so) */ -const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version ) +const struct vulkan_funcs *__wine_get_vulkan_driver( UINT version ) { return user_driver->pwine_get_vulkan_driver( version ); } diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 979fa8475b2..3054bed8347 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1326,9 +1326,6 @@ # OpenGL @ cdecl __wine_get_wgl_driver(long long)
-# Vulkan -@ cdecl __wine_get_vulkan_driver(long) - # gdi32 @ stdcall SetDIBits(long long long long ptr ptr long) @ cdecl __wine_get_brush_bitmap_info(long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d8509c83445..6e9a1926891 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -207,7 +207,6 @@ struct unix_funcs BOOL (CDECL *get_brush_bitmap_info)( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ); BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); - const struct vulkan_funcs * (CDECL *get_vulkan_driver)( UINT version ); struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); }; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index f331039714e..c5078c8a7f7 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -798,12 +798,6 @@ BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTME return unix_funcs->get_file_outline_text_metric( path, otm ); }
-const struct vulkan_funcs * CDECL __wine_get_vulkan_driver(UINT version) -{ - if (!unix_funcs) return NULL; - return unix_funcs->get_vulkan_driver( version ); -} - struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) { if (!unix_funcs) return NULL; diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5dd5fbcf578..2eeff42c56e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -156,7 +156,7 @@ DIRECT_CALL_FUNCTIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 10 +DRIVER_VERSION = 11
class ThunkType(Enum): NONE = 1 @@ -3202,7 +3202,7 @@ class VkGenerator(object): f.write(" VkSurfaceKHR (*p_wine_get_native_surface)(VkSurfaceKHR);\n") f.write("};\n\n")
- f.write("extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver(UINT version);\n\n") + f.write("extern const struct vulkan_funcs * __wine_get_vulkan_driver(UINT version);\n\n")
f.write("static inline void *get_vulkan_driver_device_proc_addr(\n") f.write(" const struct vulkan_funcs *vulkan_funcs, const char *name)\n{\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 071dbd4cdff..da89cdd5ba2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -26,7 +26,7 @@ #include <stdlib.h>
#include "vulkan_private.h" -#include "winreg.h" +#include "wine/vulkan_driver.h" #include "ntuser.h"
WINE_DEFAULT_DEBUG_CHANNEL(vulkan); diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 2efa56e0193..3ba945dbfcc 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -28,7 +28,6 @@ #include "winternl.h" #include "wine/debug.h" #include "wine/vulkan.h" -#include "wine/vulkan_driver.h" #include "wine/unixlib.h"
#include "loader_thunks.h" diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 9acfaf1f65f..58b6aa9f0b8 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -339,6 +339,5 @@ extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT #endif /* WINE_UNIX_LIB */
extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); -extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version );
#endif /* __WINE_WINE_GDI_DRIVER_H */ diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 110716e3160..f5269d554fb 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -13,7 +13,7 @@ #define __WINE_VULKAN_DRIVER_H
/* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 10 +#define WINE_VULKAN_DRIVER_VERSION 11
struct vulkan_funcs { @@ -46,7 +46,7 @@ struct vulkan_funcs VkSurfaceKHR (*p_wine_get_native_surface)(VkSurfaceKHR); };
-extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver(UINT version); +extern const struct vulkan_funcs * __wine_get_vulkan_driver(UINT version);
static inline void *get_vulkan_driver_device_proc_addr( const struct vulkan_funcs *vulkan_funcs, const char *name)