From 26a61f34ba0a6b01c098e6a286a6a52d6d963d3f Mon Sep 17 00:00:00 2001 From: Gnimuc Date: Thu, 24 Sep 2020 17:48:23 +0800 Subject: [PATCH] Minor fix --- src/LibVulkan.jl | 2 +- test/glfw.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LibVulkan.jl b/src/LibVulkan.jl index 13d1748..61f7dd9 100644 --- a/src/LibVulkan.jl +++ b/src/LibVulkan.jl @@ -3,7 +3,7 @@ module LibVulkan import Libdl paths = String[] -const libvulkan = Libdl.find_library(["libvulkan", "vulkan", "vulkan-1", "libvulkan.so.1"], paths) +const libvulkan = Libdl.find_library(["libvulkan", "vulkan", "vulkan-1", "libvulkan.so.1", "libMoltenVK"], paths) @assert libvulkan != "" using CEnum diff --git a/test/glfw.jl b/test/glfw.jl index e10392e..c38f821 100644 --- a/test/glfw.jl +++ b/test/glfw.jl @@ -16,7 +16,7 @@ flags = UInt32(0) pApplicationInfo = Base.unsafe_convert(Ptr{VkApplicationInfo}, appInfoRef) requiredExtensions = GLFW.GetRequiredInstanceExtensions() @static if Sys.isapple() - @assert "VK_MVK_macos_surface" in requiredExtensions + @assert ("VK_MVK_macos_surface" in requiredExtensions) || ("VK_EXT_metal_surface" in requiredExtensions) end enabledExtensionCount = Ref{Cuint}(0) ppEnabledExtensionNames = ccall((:glfwGetRequiredInstanceExtensions, GLFW.libglfw), Ptr{Cstring}, (Ref{Cuint},), enabledExtensionCount)