We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Only look for libvulkan.dylib for Vulkan Portability library

portability2.patch (text/plain), 7.48 KB, created by Dzmitry Malyshau on 2019-06-11 20:01:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dzmitry Malyshau

Created: 2019-06-11 20:01:25 UTC

Size: 7.48 KB

patch

obsolete

>diff -r d5b4d374a312 include/SDL_config_macosx.h
>--- a/include/SDL_config_macosx.h	Wed Mar 27 08:17:05 2019 -0700
>+++ b/include/SDL_config_macosx.h	Tue Jun 11 15:59:45 2019 -0400
>@@ -218,7 +218,7 @@
> #endif
> 
> /* Enable Vulkan support */
>-/* Metal/MoltenVK/Vulkan only supported on 64-bit architectures with 10.11+ */
>+/* Metal/Vulkan Portability only supported on 64-bit architectures with 10.11+ */
> #if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
> #define SDL_VIDEO_VULKAN 1
> #else
>diff -r d5b4d374a312 include/SDL_vulkan.h
>--- a/include/SDL_vulkan.h	Wed Mar 27 08:17:05 2019 -0700
>+++ b/include/SDL_vulkan.h	Tue Jun 11 15:59:45 2019 -0400
>@@ -98,8 +98,8 @@
>  *        applications to link with libvulkan (and historically MoltenVK was
>  *        provided as a static library). If it is not found then, on macOS, SDL
>  *        will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib,
>- *        \c MoltenVK.framework/MoltenVK and \c libMoltenVK.dylib in that order.
>- *        On iOS SDL will attempt to load \c libMoltenVK.dylib. Applications
>+ *        followed by \c libvulkan.dylib, in that order.
>+ *        On iOS SDL will attempt to load \c libvulkan.dylib only. Applications
>  *        using a dynamic framework or .dylib must ensure it is included in its
>  *        application bundle.
>  *
>@@ -153,7 +153,7 @@
>  *  is smaller than the number of required extensions, \c SDL_FALSE will be
>  *  returned instead of \c SDL_TRUE, to indicate that not all the required
>  *  extensions were returned.
>- * 
>+ *
>  *  \note If \c window is not NULL, it will be checked against its creation
>  *        flags to ensure that the Vulkan flag is present. This parameter
>  *        will be removed in a future major release.
>diff -r d5b4d374a312 src/video/cocoa/SDL_cocoavulkan.m
>--- a/src/video/cocoa/SDL_cocoavulkan.m	Wed Mar 27 08:17:05 2019 -0700
>+++ b/src/video/cocoa/SDL_cocoavulkan.m	Tue Jun 11 15:59:45 2019 -0400
>@@ -19,7 +19,7 @@
>   3. This notice may not be removed or altered from any source distribution.
> */
> 
>-/* 
>+/*
>  * @author Mark Callow, www.edgewise-consulting.com. Based on Jacob Lifshay's
>  * SDL_x11vulkan.c.
>  */
>@@ -42,8 +42,7 @@
> const char* defaultPaths[] = {
>     "vulkan.framework/vulkan",
>     "libvulkan.1.dylib",
>-    "MoltenVK.framework/MoltenVK",
>-    "libMoltenVK.dylib"
>+    "libvulkan.dylib",
> };
> 
> /* Since libSDL is most likely a .dylib, need RTLD_DEFAULT not RTLD_SELF. */
>@@ -58,7 +57,7 @@
>     PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = NULL;
> 
>     if (_this->vulkan_config.loader_handle) {
>-        return SDL_SetError("Vulkan/MoltenVK already loaded");
>+        return SDL_SetError("Vulkan Portability library is already loaded.");
>     }
> 
>     /* Load the Vulkan loader library */
>@@ -67,9 +66,7 @@
>     }
> 
>     if (!path) {
>-        /* MoltenVK framework, currently, v0.17.0, has a static library and is
>-         * the recommended way to use the package. There is likely no object to
>-         * load. */
>+        /* Handle the case where Vulkan Portability is linked statically. */
>         vkGetInstanceProcAddr =
>          (PFN_vkGetInstanceProcAddr)dlsym(DEFAULT_HANDLE,
>                                           "vkGetInstanceProcAddr");
>@@ -99,7 +96,7 @@
>         }
> 
>         if (_this->vulkan_config.loader_handle == NULL) {
>-            return SDL_SetError("Failed to load Vulkan/MoltenVK library");
>+            return SDL_SetError("Failed to load Vulkan Portability library");
>         }
> 
>         SDL_strlcpy(_this->vulkan_config.loader_path, foundPath,
>@@ -139,11 +136,11 @@
>     }
>     SDL_free(extensions);
>     if (!hasSurfaceExtension) {
>-        SDL_SetError("Installed MoltenVK/Vulkan doesn't implement the "
>+        SDL_SetError("Installed Vulkan Portability library doesn't implement the "
>                      VK_KHR_SURFACE_EXTENSION_NAME " extension");
>         goto fail;
>     } else if (!hasMacOSSurfaceExtension) {
>-        SDL_SetError("Installed MoltenVK/Vulkan doesn't implement the "
>+        SDL_SetError("Installed Vulkan Portability library doesn't implement the "
>                      VK_MVK_MACOS_SURFACE_EXTENSION_NAME "extension");
>         goto fail;
>     }
>diff -r d5b4d374a312 src/video/uikit/SDL_uikitvulkan.m
>--- a/src/video/uikit/SDL_uikitvulkan.m	Wed Mar 27 08:17:05 2019 -0700
>+++ b/src/video/uikit/SDL_uikitvulkan.m	Tue Jun 11 15:59:45 2019 -0400
>@@ -39,7 +39,9 @@
> 
> #include <dlfcn.h>
> 
>-#define DEFAULT_MOLTENVK  "libMoltenVK.dylib"
>+const char* defaultPaths[] = {
>+    "libvulkan.dylib",
>+};
> /* Since libSDL is static, could use RTLD_SELF. Using RTLD_DEFAULT is future
>  * proofing. */
> #define DEFAULT_HANDLE RTLD_DEFAULT
>@@ -53,7 +55,7 @@
>     PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = NULL;
> 
>     if (_this->vulkan_config.loader_handle) {
>-        return SDL_SetError("MoltenVK/Vulkan already loaded");
>+        return SDL_SetError("Vulkan Portability library is already loaded.");
>     }
> 
>     /* Load the Vulkan loader library */
>@@ -62,9 +64,7 @@
>     }
> 
>     if (!path) {
>-        /* MoltenVK framework, currently, v0.17.0, has a static library and is
>-         * the recommended way to use the package. There is likely no object to
>-         * load. */
>+        /* Handle the case where Vulkan Portability is linked statically. */
>         vkGetInstanceProcAddr =
>         (PFN_vkGetInstanceProcAddr)dlsym(DEFAULT_HANDLE,
>                                          "vkGetInstanceProcAddr");
>@@ -73,15 +73,29 @@
>     if (vkGetInstanceProcAddr) {
>         _this->vulkan_config.loader_handle = DEFAULT_HANDLE;
>     } else {
>-        if (!path) {
>+        const char** paths;
>+        const char *foundPath = NULL;
>+        int numPaths;
>+        int i;
>+
>+        if (path) {
>+            paths = &path;
>+            numPaths = 1;
>+        } else {
>             /* Look for the .dylib packaged with the application instead. */
>-            path = DEFAULT_MOLTENVK;
>+            paths = defaultPaths;
>+            numPaths = SDL_arraysize(defaultPaths);
>         }
> 
>-        _this->vulkan_config.loader_handle = SDL_LoadObject(path);
>-        if (!_this->vulkan_config.loader_handle) {
>-            return -1;
>+        for (i = 0; i < numPaths && _this->vulkan_config.loader_handle == NULL; i++) {
>+            foundPath = paths[i];
>+            _this->vulkan_config.loader_handle = SDL_LoadObject(foundPath);
>         }
>+
>+        if (_this->vulkan_config.loader_handle == NULL) {
>+            return SDL_SetError("Failed to load Vulkan Portability library");
>+        }
>+
>         SDL_strlcpy(_this->vulkan_config.loader_path, path,
>                     SDL_arraysize(_this->vulkan_config.loader_path));
>         vkGetInstanceProcAddr =
>@@ -93,7 +107,7 @@
>     if (!vkGetInstanceProcAddr) {
>         SDL_SetError("Failed to find %s in either executable or %s: %s",
>                      "vkGetInstanceProcAddr",
>-                     DEFAULT_MOLTENVK,
>+                     "linked Vulkan Portability library",
>                      (const char *) dlerror());
>         goto fail;
>     }
>@@ -128,11 +142,11 @@
>     SDL_free(extensions);
> 
>     if (!hasSurfaceExtension) {
>-        SDL_SetError("Installed MoltenVK/Vulkan doesn't implement the "
>+        SDL_SetError("Installed Vulkan Portability doesn't implement the "
>                      VK_KHR_SURFACE_EXTENSION_NAME " extension");
>         goto fail;
>     } else if (!hasIOSSurfaceExtension) {
>-        SDL_SetError("Installed MoltenVK/Vulkan doesn't implement the "
>+        SDL_SetError("Installed Vulkan Portability doesn't implement the "
>                      VK_MVK_IOS_SURFACE_EXTENSION_NAME "extension");
>         goto fail;
>     }

Actions: View | Diff

Attachments on bug 4570: 3716 | 3819

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.