niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

winex11: Remove unnecessary X11DRV_get_vk_* helpers.

Browse source
This commit is contained in:
Rémi Bernon 2024-02-12 22:12:11 +01:00 • committed by Alexandre Julliard
parent 6f122f48d3
commit 77f4d2207a
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/winex11.drv/vulkan.c
View file

@ -87,8 +87,7 @@ static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevi
static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *);
static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *);
static void *X11DRV_get_vk_device_proc_addr(const char *name); static const struct vulkan_funcs vulkan_funcs;
static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name);
static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle)
{ {
@ -439,7 +438,7 @@ static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name)
TRACE("%p, %s\n", device, debugstr_a(name)); TRACE("%p, %s\n", device, debugstr_a(name));
if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) if ((proc_addr = get_vulkan_driver_device_proc_addr( &vulkan_funcs, name )))
return proc_addr; return proc_addr;
return pvkGetDeviceProcAddr(device, name); return pvkGetDeviceProcAddr(device, name);
@ -451,7 +450,7 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name)
TRACE("%p, %s\n", instance, debugstr_a(name)); TRACE("%p, %s\n", instance, debugstr_a(name));
if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) if ((proc_addr = get_vulkan_driver_instance_proc_addr( &vulkan_funcs, instance, name )))
return proc_addr; return proc_addr;
return pvkGetInstanceProcAddr(instance, name); return pvkGetInstanceProcAddr(instance, name);
@ -532,16 +531,6 @@ static const struct vulkan_funcs vulkan_funcs =
X11DRV_wine_get_host_surface, X11DRV_wine_get_host_surface,
}; };
static void *X11DRV_get_vk_device_proc_addr(const char *name)
{
return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name);
}
static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name)
{
return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name);
}
const struct vulkan_funcs *get_vulkan_driver(UINT version) const struct vulkan_funcs *get_vulkan_driver(UINT version)
{ {
static pthread_once_t init_once = PTHREAD_ONCE_INIT; static pthread_once_t init_once = PTHREAD_ONCE_INIT;