archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix using trunk version on mac (#4164)

Browse Source 
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.
This commit is contained in:
Fredrik Fornwall 2023-09-22 14:58:33 +02:00 committed by GitHub
parent 855fefc10e
commit 85e2141355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Cargo.toml
View File

@ -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"
@ -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" }

2
wgpu-hal/Cargo.toml
View File

@ -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"