Fix vkCreateInstance failure for Vulkan 1.3 or higher on macOS

Author: floppyhammer

CMakeLists.txt

@@ -48,6 +48,11 @@ if (PATHFINDER_BACKEND_VULKAN)
 
     # Don't use add_compile_definitions, which doesn't propagate to parent projects.
     target_compile_definitions(pathfinder PRIVATE PATHFINDER_USE_VULKAN)
+
+    # Enable this for Vulkan 1.3 and higher on macOS.
+    if (APPLE)
+        target_compile_definitions(pathfinder PRIVATE PATHFINDER_VKB_ENABLE_PORTABILITY)
+    endif ()
 else ()
     message("[Pathfinder] Disabled Vulkan backend")
 endif ()

pathfinder/gpu/vk/window_builder.cpp

@@ -189,6 +189,9 @@ void WindowBuilderVk::create_instance() {
     const auto extensions = get_required_instance_extensions();
     instance_info.enabledExtensionCount = static_cast<uint32_t>(extensions.size());
     instance_info.ppEnabledExtensionNames = extensions.data();
+#ifdef PATHFINDER_VKB_ENABLE_PORTABILITY
+    instance_info.flags = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
+#endif
 
     VkDebugUtilsMessengerCreateInfoEXT debug_create_info;
     if (enable_validation_layers_) {
@@ -390,6 +393,10 @@ std::vector<const char *> WindowBuilderVk::get_required_instance_extensions() {
         extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
     }
 
+#ifdef PATHFINDER_VKB_ENABLE_PORTABILITY
+    extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
+#endif
+
     return extensions;
 }