mirror of
https://github.com/glfw/glfw.git
synced 2025-04-11 19:32:02 +00:00
Merge 4512d49486
into 8f470597d6
This commit is contained in:
commit
9a689b88e2
@ -468,7 +468,7 @@ void* _glfwLoadLocalVulkanLoaderCocoa(void)
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
CFURLRef loaderUrl = CFURLCreateCopyAppendingPathComponent(
|
CFURLRef loaderUrl = CFURLCreateCopyAppendingPathComponent(
|
||||||
kCFAllocatorDefault, frameworksUrl, CFSTR("libvulkan.1.dylib"), false);
|
kCFAllocatorDefault, frameworksUrl, CFSTR("libMoltenVK.dylib"), false);
|
||||||
if (!loaderUrl)
|
if (!loaderUrl)
|
||||||
{
|
{
|
||||||
CFRelease(frameworksUrl);
|
CFRelease(frameworksUrl);
|
||||||
|
@ -60,7 +60,7 @@ GLFWbool _glfwInitVulkan(int mode)
|
|||||||
#elif defined(_GLFW_WIN32)
|
#elif defined(_GLFW_WIN32)
|
||||||
_glfw.vk.handle = _glfwPlatformLoadModule("vulkan-1.dll");
|
_glfw.vk.handle = _glfwPlatformLoadModule("vulkan-1.dll");
|
||||||
#elif defined(_GLFW_COCOA)
|
#elif defined(_GLFW_COCOA)
|
||||||
_glfw.vk.handle = _glfwPlatformLoadModule("libvulkan.1.dylib");
|
_glfw.vk.handle = _glfwPlatformLoadModule("libMoltenVK.dylib");
|
||||||
if (!_glfw.vk.handle)
|
if (!_glfw.vk.handle)
|
||||||
_glfw.vk.handle = _glfwLoadLocalVulkanLoaderCocoa();
|
_glfw.vk.handle = _glfwLoadLocalVulkanLoaderCocoa();
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
||||||
|
Loading…
Reference in New Issue
Block a user