macOS: debug builds use vulkan-loader

Author: warmenhoven

gfx/common/vulkan_common.c

@@ -47,6 +47,19 @@
 #define VENDOR_ID_NV 0x10DE
 #define VENDOR_ID_INTEL 0x8086
 
+#ifdef __APPLE__
+#if VK_HEADER_VERSION < 216
+/* Portability enumeration extension for MoltenVK through Vulkan loader.
+ * These may not be defined in older Vulkan headers. */
+#ifndef VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME
+#define VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME "VK_KHR_portability_enumeration"
+#endif
+#ifndef VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR
+#define VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR 0x00000001
+#endif
+#endif
+#endif
+
 #if defined(_WIN32) || defined(__APPLE__)
 #define VULKAN_EMULATE_MAILBOX
 #endif
@@ -561,7 +574,8 @@ static const char *vulkan_device_extensions[]  = {
 
 static const char *vulkan_optional_device_extensions[] = {
    "VK_KHR_sampler_mirror_clamp_to_edge",
-   "VK_EXT_full_screen_exclusive"
+   "VK_EXT_full_screen_exclusive",
+   "VK_KHR_portability_subset"
 };
 
 static VkDevice vulkan_context_create_device_wrapper(
@@ -894,6 +908,9 @@ static bool vulkan_context_init_device(gfx_ctx_vulkan_data_t *vk)
 #endif
 
 static const char *vulkan_optional_instance_extensions[] = {
+#ifdef __APPLE__
+   VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME,
+#endif
 #ifdef VULKAN_HDR_SWAPCHAIN
    VULKAN_COLORSPACE_EXTENSION_NAME
 #endif
@@ -984,6 +1001,18 @@ static VkInstance vulkan_context_create_instance_wrapper(void *opaque, const VkI
    }
 #endif
 
+#ifdef __APPLE__
+   /* Check if portability enumeration was enabled (needed for Vulkan loader to find MoltenVK) */
+   for (i = 0; i < info.enabledExtensionCount; i++)
+   {
+      if (string_is_equal(instance_extensions[i], VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME))
+      {
+         info.flags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
+         break;
+      }
+   }
+#endif
+
    if (info.pApplicationInfo)
    {
       uint32_t supported_instance_version = VK_API_VERSION_1_0;
@@ -2451,7 +2480,10 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
          int use_mab                      = settings->bools.video_use_metal_arg_buffers;
          setenv("MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS", use_mab ? "1" : "0", 1);
       }
-      if (__builtin_available(macOS 10.15, iOS 13, tvOS 12, *))
+      /* Try Vulkan loader first (enables validation layers if installed).
+       * Falls back to MoltenVK directly if loader not available. */
+      vulkan_library = dylib_load("libvulkan.dylib");
+      if (!vulkan_library && __builtin_available(macOS 10.15, iOS 13, tvOS 12, *))
          vulkan_library = dylib_load("MoltenVK");
       if (!vulkan_library)
          vulkan_library = dylib_load("MoltenVK-v1.2.7.framework");

pkg/apple/BaseConfig.xcconfig

@@ -149,6 +149,12 @@ OTHER_CFLAGS[sdk=iphonesimulator*] = $(inherited) $(OTHER_CFLAGS_IOS)
 OTHER_CFLAGS[config=Debug] = $(inherited) -DDEBUG=1
 OTHER_CFLAGS[config=Release] = $(inherited) -DNDEBUG -DNS_BLOCK_ASSERTIONS=1
 
+// Vulkan validation layer support for macOS debug builds
+// Requires: brew install vulkan-loader vulkan-validationlayers
+//OTHER_CFLAGS[sdk=macosx*][config=Debug] = $(inherited) -DVULKAN_DEBUG
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*][config=Debug] = $(inherited) /opt/homebrew/opt/vulkan-loader/lib /usr/local/opt/vulkan-loader/lib
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*][config=Debug] = $(inherited) /opt/homebrew/opt/vulkan-validationlayers/lib /usr/local/opt/vulkan-validationlayers/lib
+
 // Keep function symbols for KSCrash symbolication in release builds
 // (debug symbols still go to dSYM files)
 STRIP_STYLE[config=Release] = debugging

pkg/apple/make-frameworks.sh

@@ -111,3 +111,18 @@ if [ -n "$MOLTENVK_LEGACY_XCFRAMEWORK_PATH" -a -d "${MOLTENVK_LEGACY_XCFRAMEWORK
     codesign --force --verbose --sign "${CODE_SIGN_IDENTITY_FOR_ITEMS}" "${OUTDIR}/MoltenVK-${MOLTENVK_LEGACY_VERSION}.framework/MoltenVK-${MOLTENVK_LEGACY_VERSION}"
     codesign --force --verbose --sign "${CODE_SIGN_IDENTITY_FOR_ITEMS}" "${OUTDIR}/MoltenVK-${MOLTENVK_LEGACY_VERSION}.framework"
 fi
+
+# Copy Vulkan ICD file for loader discovery (macOS only)
+# This allows the Vulkan loader to find MoltenVK when using validation layers
+# Only include current MoltenVK - legacy version is for old OS support, not validation
+if [ "$PLATFORM_FAMILY_NAME" = "macOS" ] ; then
+    RESOURCES_DIR="$(dirname "$OUTDIR")/Resources"
+    ICD_DIR="$RESOURCES_DIR/vulkan/icd.d"
+    mkdir -p "$ICD_DIR"
+
+    if [ -f "${OUTDIR}/MoltenVK.framework/Versions/A/Resources/MoltenVK_icd.json" ] ; then
+        sed 's|\.\./MoltenVK|../../../Frameworks/MoltenVK.framework/Versions/A/MoltenVK|' \
+            "${OUTDIR}/MoltenVK.framework/Versions/A/Resources/MoltenVK_icd.json" \
+            > "$ICD_DIR/MoltenVK_icd.json"
+    fi
+fi