Add static molten vk for macos (v1.2.6).

ddnet · Jan 14, 2025 · 1577406 · 1577406
1 parent 8313293
commit 1577406
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -76,6 +76,8 @@ jobs:
         brew install pkg-config autoconf automake || true
         # for ffmpeg
         brew install ffmpeg || true
+        # for building molten vk
+        brew install python-setuptools || true
 
     - name: Prepare msys dependencies
       if: contains(matrix.os, 'windows')

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/graphics-backend/Cargo.toml b/lib/graphics-backend/Cargo.toml
@@ -51,7 +51,11 @@ log = "0.4.22"
 either = "1.13.0"
 replace_with = "0.1.7"
 crossbeam = "0.8.4"
+futures = "0.3.31"
+
+[target.'cfg(target_os = "macos")'.dependencies]
+ash-molten = { git = "https://github.com/Jupeyy/ash-molten", branch = "ddnet_moltenvk" }
 
-#[cfg(test)]
+[dev-dependencies]
 base-http = { path = "../base-http" }
-futures = "0.3.31"
+
diff --git a/lib/graphics-backend/src/backends/vulkan/instance.rs b/lib/graphics-backend/src/backends/vulkan/instance.rs
@@ -29,7 +29,10 @@ impl Instance {
         display_requirements: &BackendDisplayRequirements,
         dbg_mode: GfxDebugModes,
     ) -> anyhow::Result<Arc<Self>> {
+        #[cfg(not(target_os = "macos"))]
         let entry = unsafe { ash::Entry::load() }?;
+        #[cfg(target_os = "macos")]
+        let entry = ash_molten::load();
 
         let extensions = &display_requirements.extensions;