Skip to content

Commit 71c6330

Browse files
committed
ash runner: remove ash-molten, require vulkan sdk on macos
1 parent c1d2b48 commit 71c6330

File tree

4 files changed

+3
-97
lines changed

4 files changed

+3
-97
lines changed

Cargo.lock

Lines changed: 1 addition & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ supported.
4747
on WGPU+wasm.)
4848

4949
- ash runner:
50+
- MacOS: requires MoltenVK (or the Vulkan SDK) to be installed
5051
- `cargo run --release -p example-runner-ash` runs the sky shader. Use the up and
5152
down arrows to adjust the sun's intensity. Use F5 to recompile the shader
5253
code (but note that the image won't redraw afterwards unless the intensity is

examples/runners/ash/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,3 @@ shared = { path = "../../shaders/shared" }
2424
spirv-builder = { workspace = true, default-features = false }
2525
anyhow = "1.0.98"
2626
bytemuck.workspace = true
27-
28-
[target.'cfg(target_os = "macos")'.dependencies]
29-
ash-molten = { version = "0.20", features = ["pre-built"] }

examples/runners/ash/src/device.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,7 @@ impl Deref for MyDevice {
3232
impl MyDevice {
3333
pub fn new(extension_names: &[*const c_char], options: &Options) -> anyhow::Result<Arc<Self>> {
3434
unsafe {
35-
cfg_if::cfg_if! {
36-
if #[cfg(target_os = "macos")] {
37-
let entry = ash_molten::load();
38-
} else {
39-
let entry = ash::Entry::load()?;
40-
}
41-
}
35+
let entry = ash::Entry::load()?;
4236

4337
let instance = {
4438
let layer_names: &'static [_] = if options.debug_layer {

0 commit comments

Comments
 (0)