fix(sagepatch,macos): default DXVK_HUD off; MoltenVK can't compile DrawIndex

ebellumat · ebellumat · commit 55f06b77c92f · 2026-04-25T21:07:11.000-03:00
The wrapper scripts shipped DXVK_HUD=fps when SagePatch was active. On
macOS 26 (MoltenVK 1.4.1, current SDK), DXVK's HUD pipeline shader uses
gl_DrawID, which lowers to SPIR-V DrawIndex. SPIRV-Cross to MSL has no
equivalent for that decoration and aborts conversion:

  [mvk-error] SPIR-V to MSL conversion error: DrawIndex is not supported in MSL.
  err:   Failed to create swap chain blit pipeline: VK_ERROR_INITIALIZATION_FAILED

The blit pipeline failure means DXVK can never present a frame; the game
hangs at the EA Games logo (last thing the engine drew before DXVK started
needing the blit pipeline).

Revert the default to DXVK_HUD=0 on the three macOS wrapper scripts.
Users who want the FPS overlay can still opt in with DXVK_HUD=fps.

Linux and Flatpak wrappers are unchanged: native Vulkan drivers handle
DrawIndex correctly there.
diff --git a/scripts/build/macos/bundle-macos-generals.sh b/scripts/build/macos/bundle-macos-generals.sh
@@ -372,9 +372,8 @@ fi
 # GeneralsX @bugfix fbraz3 20/03/2026 DXVK requires this env var on non-Win32; SDL3 matches game windowing layer
 export DXVK_WSI_DRIVER="SDL3"
 
-if [[ -f "${LIB_DIR}/libsage_patch.dylib" && "${SAGE_PATCH_DISABLED:-0}" != "1" ]]; then
-    export DXVK_HUD="${DXVK_HUD:-fps}"
-fi
+# DXVK HUD: kept opt-in. MoltenVK on macOS 26 can't compile DXVK's HUD shader.
+export DXVK_HUD="${DXVK_HUD:-0}"
 
 if [[ -f "${RESOURCES_DIR}/MoltenVK_icd.json" ]]; then
     export VK_ICD_FILENAMES="${RESOURCES_DIR}/MoltenVK_icd.json"
diff --git a/scripts/build/macos/bundle-macos-zh.sh b/scripts/build/macos/bundle-macos-zh.sh
@@ -393,11 +393,11 @@ fi
 # GeneralsX @bugfix fbraz3 20/03/2026 DXVK requires this env var on non-Win32; SDL3 matches game windowing layer
 export DXVK_WSI_DRIVER="SDL3"
 
-# DXVK HUD: when SagePatch is bundled and active, default to "fps" so casual
-# users see a frame counter without extra config. Set DXVK_HUD=0 to disable.
-if [[ -f "${LIB_DIR}/libsage_patch.dylib" && "${SAGE_PATCH_DISABLED:-0}" != "1" ]]; then
-    export DXVK_HUD="${DXVK_HUD:-fps}"
-fi
+# DXVK HUD: kept opt-in. MoltenVK on macOS 26 cannot compile DXVK's HUD
+# pipeline shader (gl_DrawID / SPIR-V DrawIndex has no MSL equivalent yet).
+# Defaulting it on causes the swap chain blit pipeline to fail. Users wanting
+# an FPS overlay set DXVK_HUD=fps themselves.
+export DXVK_HUD="${DXVK_HUD:-0}"
 
 if [[ -f "${RESOURCES_DIR}/MoltenVK_icd.json" ]]; then
     export VK_ICD_FILENAMES="${RESOURCES_DIR}/MoltenVK_icd.json"
diff --git a/scripts/build/macos/deploy-macos-zh.sh b/scripts/build/macos/deploy-macos-zh.sh
@@ -196,12 +196,11 @@ fi
 # GeneralsX @bugfix fbraz3 20/03/2026 DXVK requires DXVK_WSI_DRIVER on non-Win32; must match game windowing (SDL3)
 export DXVK_WSI_DRIVER="SDL3"
 
-# DXVK HUD: SagePatch builds default to "fps" so casual users see frame rate
-# without extra config. Set DXVK_HUD=0 explicitly to disable, or anything else
-# (e.g. fps,memory,version) to customize.
-if [[ -f "\${SCRIPT_DIR}/libsage_patch.dylib" && "\${SAGE_PATCH_DISABLED:-0}" != "1" ]]; then
-    export DXVK_HUD="\${DXVK_HUD:-fps}"
-fi
+# DXVK HUD: kept opt-in. MoltenVK on macOS 26 cannot compile DXVK's HUD
+# pipeline shader (uses gl_DrawID / SPIR-V DrawIndex which has no MSL
+# equivalent yet), so defaulting it on breaks the swap chain blit pipeline.
+# Users wanting an FPS overlay set DXVK_HUD=fps themselves.
+export DXVK_HUD="\${DXVK_HUD:-0}"
 
 # MoltenVK ICD manifest — deployed alongside the binary by deploy-macos-zh.sh
 if [[ -f "\${SCRIPT_DIR}/MoltenVK_icd.json" ]]; then
