File tree Expand file tree Collapse file tree 4 files changed +10
-8
lines changed Expand file tree Collapse file tree 4 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -88,6 +88,15 @@ By @stefnotch in [#5410](https://github.com/gfx-rs/wgpu/pull/5410)
8888
8989- Avoid introducing spurious features for optional dependencies. By @bjorn3 in [ #5691 ] ( https://github.com/gfx-rs/wgpu/pull/5691 )
9090
91+ #### Metal
92+ - Removed the ` link ` Cargo feature.
93+
94+ This was used to allow weakly linking frameworks. This can be achieved with putting something like the following in your ` .cargo/config.toml ` instead:
95+ ``` toml
96+ [target .'cfg(target_vendor = "apple")' ]
97+ rustflags = [" -C" , " link-args=-weak_framework Metal -weak_framework QuartzCore -weak_framework CoreGraphics" ]
98+ ```
99+
91100### Bug Fixes
92101
93102### General
Original file line number Diff line number Diff line change @@ -32,17 +32,12 @@ ignored = ["cfg_aliases"]
3232[lib ]
3333
3434[features ]
35- default = [" link" ]
36-
3735# # Log all API entry points at info instead of trace level.
3836api_log_info = []
3937
4038# # Log resource lifecycle management at info instead of trace level.
4139resource_log_info = []
4240
43- # # Use static linking for libraries. Disable to manually link. Enabled by default.
44- link = [" hal/link" ]
45-
4641# # Support the Renderdoc graphics debugger:
4742# # <https://renderdoc.org/>
4843renderdoc = [" hal/renderdoc" ]
Original file line number Diff line number Diff line change @@ -37,7 +37,6 @@ ignored = ["cfg_aliases"]
3737[lib ]
3838
3939[features ]
40- default = [" link" ]
4140metal = [" naga/msl-out" , " dep:block" ]
4241vulkan = [
4342 " naga/spv-out" ,
@@ -76,7 +75,6 @@ windows_rs = ["dep:gpu-allocator"]
7675dxc_shader_compiler = [" dep:hassle-rs" ]
7776renderdoc = [" dep:libloading" , " dep:renderdoc-sys" ]
7877fragile-send-sync-non-atomic-wasm = [" wgt/fragile-send-sync-non-atomic-wasm" ]
79- link = [" metal/link" ]
8078# Panic when running into an out-of-memory error (for debugging purposes).
8179#
8280# Only affects the d3d12 and vulkan backends.
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ use objc::{
1717use parking_lot:: { Mutex , RwLock } ;
1818
1919#[ cfg( target_os = "macos" ) ]
20- #[ cfg_attr ( feature = " link" , link ( name = "QuartzCore" , kind = "framework" ) ) ]
20+ #[ link( name = "QuartzCore" , kind = "framework" ) ]
2121extern "C" {
2222 #[ allow( non_upper_case_globals) ]
2323 static kCAGravityTopLeft: * mut Object ;
You can’t perform that action at this time.
0 commit comments