system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 08:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

winevulkan: Remove __wine_get_vulkan_driver PE entry point.

Browse source
This commit is contained in:
Jacek Caban 2022-07-25 22:08:03 +02:00 committed by Alexandre Julliard
parent bb94ec1943
commit 68bb2f62e9
10 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/win32u/gdiobj.c
View file

@ -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,
};

8
dlls/win32u/vulkan.c
View file

@ -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 );
}

3
dlls/win32u/win32u.spec
View file

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

1
dlls/win32u/win32u_private.h
View file

@ -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 );
};

6
dlls/win32u/wrappers.c
View file

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

4
dlls/winevulkan/make_vulkan
View file

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

2
dlls/winevulkan/vulkan.c
View file

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

1
dlls/winevulkan/vulkan_loader.h
View file

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

1
include/wine/gdi_driver.h
View file

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

4
include/wine/vulkan_driver.h
View file

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