From ba8b733bc3936acf1762e650ffd551f6a4bfe50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 8 Jun 2022 11:03:28 +0200 Subject: [PATCH] Update MoltenVK to 1.1.10 (#68) * Update MoltenVK to 1.1.10 No ash upgrade in this one, so only need a minor version bump. * clippy * README.md update * Decided to bump to 0.13.0 since the MoltenVK version bump is large. --- Cargo.toml | 2 +- README.md | 9 +++++++-- build/build.rs | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0e3c2d9..e188d7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ash-molten" description = "Statically linked MoltenVK for Vulkan on Mac using Ash" -version = "0.12.0+1.1.5" +version = "0.13.0+1.1.10" authors = ["Embark ", "Maik Klein "] edition = "2018" license = "MIT OR Apache-2.0" diff --git a/README.md b/README.md index 9a61fff..0ca3457 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + + + # 🌋 ash-molten [![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](https://embark.dev) @@ -41,6 +44,7 @@ let instance = entry.create_instance(&create_info, None).expect("Instance"); let devices = instance.enumerate_physical_devices(); println!("{:?}", devices); ``` + You can run the example with `cargo run`. ## How does it work? @@ -63,11 +67,12 @@ To update the version of [MoltenVK](https://github.com/KhronosGroup/MoltenVK) us - Update the crate version in `Cargo.toml` - Bump the patch version - Set the version metadata to the MoltenVK release. - - E.g. `0.2.0+37` -> `0.2.1+38`. + - E.g. `0.2.0+1.1.9` -> `0.2.1+1.1.10`. +- Before you can submit the PR, you must also update the prebuilt version. See the next section. ### Updating pre-built version -To update the prebuilt version uses, change the following: +To update the prebuilt version of MoltenVK that ash-molten uses, change the following: - Follow the steps mentioned above. - Download the MoltenVK XCFramework from, for example, the Vulkan SDK for Mac or build [MoltenVK](https://github.com/KhronosGroup/MoltenVK/) yourself. diff --git a/build/build.rs b/build/build.rs index cb9da44..28869ef 100644 --- a/build/build.rs +++ b/build/build.rs @@ -78,7 +78,7 @@ mod mac { use std::path::Path; // MoltenVK git tagged release to use - pub static MOLTEN_VK_VERSION: &str = "1.1.5"; + pub static MOLTEN_VK_VERSION: &str = "1.1.10"; pub static MOLTEN_VK_PATCH: Option<&str> = None; // Return the artifact tag in the form of "x.x.x" or if there is a patch specified "x.x.x#yyyyyyy" @@ -222,7 +222,7 @@ mod mac { let download_url = format!( "https://github.com/EmbarkStudios/ash-molten/releases/download/MoltenVK-{}/MoltenVK.xcframework.zip", - get_artifact_tag().replace("#", "%23") + get_artifact_tag().replace('#', "%23") ); let download_path = target_dir.as_ref().join("MoltenVK.xcframework.zip");