From d684b72b3e5414de923251aa81a8328608d9ce11 Mon Sep 17 00:00:00 2001 From: Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> Date: Tue, 2 Jan 2024 05:56:05 -0700 Subject: [PATCH] Check for libvulkan.1.dylib (#1755) --- snippets/DynamicLoader.hpp | 4 ++++ vulkan/vulkan.hpp | 4 ++++ vulkan/vulkansc.hpp | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/snippets/DynamicLoader.hpp b/snippets/DynamicLoader.hpp index 6c3efed..3607b92 100644 --- a/snippets/DynamicLoader.hpp +++ b/snippets/DynamicLoader.hpp @@ -28,6 +28,10 @@ } # elif defined( __APPLE__ ) m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); + if (m_library == nullptr) + { + m_library = dlopen("libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL); + } # elif defined( _WIN32 ) m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 023877d..1d7cac9 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -16302,6 +16302,10 @@ namespace VULKAN_HPP_NAMESPACE } # elif defined( __APPLE__ ) m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); + if (m_library == nullptr) + { + m_library = dlopen("libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL); + } # elif defined( _WIN32 ) m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else diff --git a/vulkan/vulkansc.hpp b/vulkan/vulkansc.hpp index 8799798..67c3218 100644 --- a/vulkan/vulkansc.hpp +++ b/vulkan/vulkansc.hpp @@ -6990,6 +6990,10 @@ namespace VULKAN_HPP_NAMESPACE } # elif defined( __APPLE__ ) m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); + if (m_library == nullptr) + { + m_library = dlopen("libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL); + } # elif defined( _WIN32 ) m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else