Rémi Bernon : winemac: Remove unnecessary macdrv_get_vk_* helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0dd1502f573b709bde2575f86b6f757612ad4cff
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0dd1502f573b709bde2575f86b6f757...

Author: Rémi Bernon 
Date:   Fri Feb 23 10:45:55 2024 +0100

winemac: Remove unnecessary macdrv_get_vk_* helper.

---

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

diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c
index 28f062d5def..d0ebd668933 100644
--- a/dlls/winemac.drv/vulkan.c
+++ b/dlls/winemac.drv/vulkan.c
@@ -89,8 +89,7 @@ static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice,
 static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *);
 static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *);

-static void *macdrv_get_vk_device_proc_addr(const char *name);
-static void *macdrv_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)
 {
@@ -414,7 +413,7 @@ static void *macdrv_vkGetDeviceProcAddr(VkDevice device, const char *name)

TRACE("%p, %s\n", device, debugstr_a(name));

-    if ((proc_addr = macdrv_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);
@@ -426,7 +425,7 @@ static void *macdrv_vkGetInstanceProcAddr(VkInstance instance, const char *name)

TRACE("%p, %s\n", instance, debugstr_a(name));

-    if ((proc_addr = macdrv_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);
@@ -503,16 +502,6 @@ static const struct vulkan_funcs vulkan_funcs =
     macdrv_wine_get_host_surface,
 };

-static void *macdrv_get_vk_device_proc_addr(const char *name)
-{
-    return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name);
-}
-
-static void *macdrv_get_vk_instance_proc_addr(VkInstance instance, const char *name)
-{
-    return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name);
-}
-
 static const struct vulkan_funcs *get_vulkan_driver(UINT version)
 {
     static pthread_once_t init_once = PTHREAD_ONCE_INIT;