Skip to content

Commit

Permalink
Fix using trunk version on mac
Browse files Browse the repository at this point in the history
Overriding the metal version in the workspace Cargo.toml using a patch
section does not work for projects building against the trunk version:

wgpu = { git = "https://github.com/gfx-rs/wgpu", branch = "trunk" }

Instead specify the metal dependencies only once in wgpu-hal.
  • Loading branch information
fornwall committed Sep 22, 2023
1 parent 855fefc commit 84609dd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
9 changes: 0 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ wgpu-test = { version = "0.17", path = "./tests"}
wgpu-types = { version = "0.17.0", path = "./wgpu-types" }
winit = { version = "0.28.6", features = [ "android-native-activity" ] }

# Metal dependencies
block = "0.1"
metal = "0.26.0"
objc = "0.2.5"
core-graphics-types = "0.1"

# Vulkan dependencies
ash = "0.37.3"
gpu-alloc = "0.6"
Expand Down Expand Up @@ -157,9 +151,6 @@ termcolor = "1.3.0"
#naga = { path = "../naga" }
#glow = { path = "../glow" }
#d3d12 = { path = "../d3d12-rs" }
#metal = { path = "../metal-rs" }
#metal = { path = "../metal-rs" }
metal = { git = "https://github.com/gfx-rs/metal-rs/", rev = "d24f1a4" } # More timer support via https://github.com/gfx-rs/metal-rs/pull/280
#web-sys = { path = "../wasm-bindgen/crates/web-sys" }
#js-sys = { path = "../wasm-bindgen/crates/js-sys" }
#wasm-bindgen = { path = "../wasm-bindgen" }
Expand Down
2 changes: 1 addition & 1 deletion wgpu-hal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ d3d12 = { version = "0.7", features = ["libloading"], optional = true }
# backend: Metal
block = { version = "0.1", optional = true }

metal = "0.26.0"
metal = { git = "https://github.com/gfx-rs/metal-rs/", rev = "d24f1a4" } # More timer support via https://github.com/gfx-rs/metal-rs/pull/280
objc = "0.2.5"
core-graphics-types = "0.1"

Expand Down

0 comments on commit 84609dd

Please sign in to comment.