cube: Fix layers on Apple

Otherwise layers won't work on Apple

5 files changed, 4 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1ce0175..56137d07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 find_package(VulkanHeaders QUIET CONFIG)
+find_package(VulkanLoader QUIET CONFIG)
 find_package(volk QUIET CONFIG)
 
 include(GNUInstallDirs)
diff --git a/cube/cube.cpp b/cube/cube.cpp
index 1d594b32..a0ed023e 100644
--- a/cube/cube.cpp
+++ b/cube/cube.cpp
@@ -43,9 +43,6 @@
 #define VULKAN_HPP_TYPESAFE_CONVERSION
 #include <vulkan/vulkan.hpp>
 
-#define VOLK_IMPLEMENTATION
-#include "volk.h"
-
 VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
 
 #include "linmath.h"
@@ -1120,16 +1117,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL Demo::debug_messenger_callback(VkDebugUtilsMessag
 }
 
 void Demo::init_vk() {
-    // Vulkan-hpp doesn't load moltenkVK, so we use volk to do that for us, then pass vkGetInstanceProcAddr along
-    VkResult err = volkInitialize();
-    if (err != VK_SUCCESS) {
-        ERR_EXIT(
-            "Unable to find the Vulkan runtime on the system.\n\n"
-            "This likely indicates that no Vulkan capable drivers are installed.",
-            "Installation Failure");
-    }
-
-    VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);
+    VULKAN_HPP_DEFAULT_DISPATCHER.init();
 
     std::vector<char const *> instance_validation_layers = {"VK_LAYER_KHRONOS_validation"};
 
diff --git a/cube/macOS/cube/CMakeLists.txt b/cube/macOS/cube/CMakeLists.txt
index 4d1de169..c638243b 100644
--- a/cube/macOS/cube/CMakeLists.txt
+++ b/cube/macOS/cube/CMakeLists.txt
@@ -59,10 +59,7 @@ add_dependencies(vkcube MoltenVK_icd-staging-json)
 target_include_directories(vkcube PRIVATE . ${MOLTENVK_DIR}/MoltenVK/include)
 
 # We do this so vkcube is linked to an individual library and NOT a framework.
-target_link_libraries(vkcube volk::volk_headers "-framework Cocoa -framework QuartzCore")
-
-# Link to MoltenVK directly, so the RPATH is setup
-target_link_libraries(vkcube ${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib)
+target_link_libraries(vkcube Vulkan::Loader volk::volk_headers "-framework Cocoa -framework QuartzCore")
 
 # Disable warnings about sprintf
 target_compile_options(vkcube PRIVATE -Wno-deprecated-declarations)
diff --git a/cube/macOS/cubepp/CMakeLists.txt b/cube/macOS/cubepp/CMakeLists.txt
index 29e5e787..6277d438 100644
--- a/cube/macOS/cubepp/CMakeLists.txt
+++ b/cube/macOS/cubepp/CMakeLists.txt
@@ -59,10 +59,7 @@ add_dependencies(vkcubepp MoltenVK_icd-staging-json)
 target_include_directories(vkcubepp PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${MOLTENVK_DIR}/MoltenVK/include)
 
 # We do this so vkcubepp is linked to an individual library and NOT a framework.
-target_link_libraries(vkcubepp volk::volk_headers "-framework Cocoa -framework QuartzCore")
-
-# Link to MoltenVK directly, so the RPATH is setup
-target_link_libraries(vkcubepp ${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib)
+target_link_libraries(vkcubepp Vulkan::Loader volk::volk_headers "-framework Cocoa -framework QuartzCore")
 
 set_target_properties(vkcubepp PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_LIST_DIR}/Info.plist)
 
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 47a1f32d..cfa99d40 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -85,9 +85,6 @@
                     "var_name": "VULKAN_HEADERS_INSTALL_DIR",
                     "repo_name": "Vulkan-Headers"
                 }
-            ],
-            "optional": [
-                "tests"
             ]
         }
     ],