Disable Embree if we're running on Apple Silicon.

stechyo · Oct 19, 2024 · 6528065 · 6528065
1 parent 0797b23
commit 6528065
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -17,7 +17,7 @@ jobs:
       - name: install-deps
         run: |
           # install scons
-          python -m pip install --break-system-packages scons==4.4.0
+          PIP_BREAK_SYSTEM_PACKAGES=1 python -m pip install scons==4.4.0
           scons --version
           # install windows deps
           sudo apt-get install mingw-w64

diff --git a/src/server_init.cpp b/src/server_init.cpp
@@ -2,6 +2,8 @@
 #include "config.hpp"
 #include "phonon.h"
 #include "steam_audio.hpp"
+#include <godot_cpp/classes/engine.hpp>
+#include <godot_cpp/classes/os.hpp>
 
 using namespace godot;
 
@@ -73,6 +75,14 @@ IPLSimulator create_simulator(IPLContext ctx, IPLAudioSettings audio_cfg, IPLSce
 
 IPLSceneSettings create_scene_cfg(IPLContext ctx) {
 	IPLSceneSettings scene_cfg = {};
+
+	if (SteamAudioConfig::scene_type == IPL_SCENETYPE_EMBREE &&
+			OS::get_singleton()->get_name() == "macOS" &&
+			Engine::get_singleton()->get_architecture_name() == "arm64") {
+		SteamAudioConfig::scene_type = IPL_SCENETYPE_DEFAULT;
+		SteamAudio::log(SteamAudio::log_info, "Embree is not supported on Apple Silicon, reverting to default scene type.");
+	}
+
 	scene_cfg.type = SteamAudioConfig::scene_type;
 	if (scene_cfg.type == IPL_SCENETYPE_EMBREE) {
 		IPLEmbreeDeviceSettings embree_cfg{};