Rémi Bernon : winemac: Use SONAME_LIBVULKAN as an alias for MoltenVK.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1ddaa1d385c804f2af9bb16d2c5082122132f09b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/1ddaa1d385c804f2af9bb16d2c50821...

Author: Rémi Bernon 
Date:   Thu Mar 21 17:13:48 2024 +0100

winemac: Use SONAME_LIBVULKAN as an alias for MoltenVK.

---

configure                 | 1 +
 configure.ac              | 2 +-
 dlls/winemac.drv/vulkan.c | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 91b272c4aea..b3cc4815aa6 100755
--- a/configure
+++ b/configure
@@ -19167,6 +19167,7 @@ printf "%s\n" "$ac_cv_lib_soname_MoltenVK" >&6; }

printf "%s\n" "#define SONAME_LIBMOLTENVK "$ac_cv_lib_soname_MoltenVK"" >>confdefs.h

+       printf "%s\n" "#define SONAME_LIBVULKAN $ac_cv_lib_soname_MoltenVK" >>confdefs.h

fi
     fi
diff --git a/configure.ac b/configure.ac
index 16f8ea99691..5398e4b1785 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1827,7 +1827,7 @@ then
     WINE_CHECK_SONAME(vulkan, vkGetInstanceProcAddr)
     if test "x$ac_cv_lib_soname_vulkan" = "x"
     then
-        WINE_CHECK_SONAME(MoltenVK, vkGetInstanceProcAddr)
+        WINE_CHECK_SONAME(MoltenVK, vkGetInstanceProcAddr, [AC_DEFINE_UNQUOTED(SONAME_LIBVULKAN,[$ac_cv_lib_soname_MoltenVK])])
     fi
 fi
 WINE_NOTICE_WITH(vulkan,[test "x$ac_cv_lib_soname_vulkan" = "x" -a "x$ac_cv_lib_soname_MoltenVK" = "x"],
diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c
index 472b2885b10..6c4ab646021 100644
--- a/dlls/winemac.drv/vulkan.c
+++ b/dlls/winemac.drv/vulkan.c
@@ -42,7 +42,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(vulkan);

-#ifdef SONAME_LIBMOLTENVK
+#ifdef SONAME_LIBVULKAN

WINE_DECLARE_DEBUG_CHANNEL(fps);

@@ -100,9 +100,9 @@ static void *vulkan_handle;

static void wine_vk_init(void)
 {
-    if (!(vulkan_handle = dlopen(SONAME_LIBMOLTENVK, RTLD_NOW)))
+    if (!(vulkan_handle = dlopen(SONAME_LIBVULKAN, RTLD_NOW)))
     {
-        ERR("Failed to load %s\n", SONAME_LIBMOLTENVK);
+        ERR("Failed to load %s\n", SONAME_LIBVULKAN);
         return;
     }

@@ -523,7 +523,7 @@ static const struct vulkan_funcs *get_vulkan_driver(UINT version)
     return NULL;
 }

-#endif /* SONAME_LIBMOLTENVK */
+#endif /* SONAME_LIBVULKAN */

const struct vulkan_funcs *macdrv_wine_get_vulkan_driver(UINT version)
 {