Rémi Bernon : winex11: Remove unnecessary X11DRV_get_vk_* helpers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 77f4d2207a428aba0a12d10d64123cd87e852297
URL:    https://gitlab.winehq.org/wine/wine/-/commit/77f4d2207a428aba0a12d10d64123cd...

Author: Rémi Bernon 
Date:   Mon Feb 12 22:12:11 2024 +0100

winex11: Remove unnecessary X11DRV_get_vk_* helpers.

---

dlls/winex11.drv/vulkan.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
index c7da02ad681..c589f6923fe 100644
--- a/dlls/winex11.drv/vulkan.c
+++ b/dlls/winex11.drv/vulkan.c
@@ -87,8 +87,7 @@ static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevi
 static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *);
 static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *);

-static void *X11DRV_get_vk_device_proc_addr(const char *name);
-static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name);
+static const struct vulkan_funcs vulkan_funcs;

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

-    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 pvkGetDeviceProcAddr(device, name);
@@ -451,7 +450,7 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *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 pvkGetInstanceProcAddr(instance, name);
@@ -532,16 +531,6 @@ static const struct vulkan_funcs vulkan_funcs =
     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)
 {
     static pthread_once_t init_once = PTHREAD_ONCE_INIT;