Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,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')
Expand Down Expand Up @@ -134,11 +136,15 @@ jobs:
cargo clippy --release --verbose --features ${{ matrix.features }} -- -D warnings
cargo clippy -p server --release --verbose --features bundled_data_dir -- -D warnings

- name: Screenshots
run: cargo test --release -- "tests::screenshots::create_screenshots"

- name: Prepare artifacts
run: |
mkdir bin-artifacts || true
mv target/release/${{ matrix.bin }} bin-artifacts
mv target/release/${{ matrix.server-bin }} bin-artifacts
mv artifacts bin-artifacts || true

- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down
37 changes: 36 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions lib/graphics-backend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = { version = "0.20.0" }

#[cfg(test)]
[dev-dependencies]
base-http = { path = "../base-http" }
futures = "0.3.31"

3 changes: 3 additions & 0 deletions lib/graphics-backend/src/backends/vulkan/instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading