Use objc2

Author: madsmtm

Cargo.lock

@@ -187,6 +187,13 @@ termcolor = "1.4.1"
 #web-sys = { path = "../wasm-bindgen/crates/web-sys" }
 #js-sys = { path = "../wasm-bindgen/crates/js-sys" }
 #wasm-bindgen = { path = "../wasm-bindgen" }
+block2 = { git = "https://github.com/madsmtm/objc2", branch = "metal-wgpu" }
+objc2 = { git = "https://github.com/madsmtm/objc2", branch = "metal-wgpu" }
+objc2-encode = { git = "https://github.com/madsmtm/objc2", branch = "metal-wgpu" }
+objc-sys = { git = "https://github.com/madsmtm/objc2", branch = "metal-wgpu" }
+objc2-foundation = { git = "https://github.com/madsmtm/objc2", branch = "metal-wgpu" }
+objc2-quartz-core = { git = "https://github.com/madsmtm/objc2", branch = "metal-wgpu" }
+objc2-metal = { git = "https://github.com/madsmtm/objc2", branch = "metal-wgpu" }
 
 # Speed up image comparison even in debug builds
 [profile.dev.package."nv-flip-sys"]

Cargo.toml

@@ -34,7 +34,7 @@ targets = [
 
 [features]
 default = ["link"]
-metal = ["naga/msl-out", "block"]
+metal = ["naga/msl-out"]
 vulkan = [
     "naga/spv-out",
     "ash",
@@ -70,7 +70,7 @@ windows_rs = ["gpu-allocator"]
 dxc_shader_compiler = ["hassle-rs"]
 renderdoc = ["libloading", "renderdoc-sys"]
 fragile-send-sync-non-atomic-wasm = ["wgt/fragile-send-sync-non-atomic-wasm"]
-link = ["metal/link"]
+link = []
 # Panic when running into an out-of-memory error (for debugging purposes).
 #
 # Only affects the d3d12 and vulkan backends.
@@ -151,13 +151,13 @@ d3d12 = { path = "../d3d12/", version = "0.19.0", optional = true, features = [
     "libloading",
 ] }
 
-[target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies]
 # backend: Metal
-block = { version = "0.1", optional = true }
-
-metal = { version = "0.27.0", git = "https://github.com/gfx-rs/metal-rs", rev = "ff8fd3d6dc7792852f8a015458d7e6d42d7fb352" }
-objc = "0.2.5"
-core-graphics-types = "0.1"
+[target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies]
+objc2 = "0.5.1"
+objc2-foundation = { version = "0.2.0", features = ["all"] }
+objc2-quartz-core = { version = "0.2.0", features = ["all"] }
+objc2-metal = { version = "0.2.0", features = ["all"] }
+block2 = "0.5"
 
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
 wasm-bindgen = "0.2.87"

wgpu-hal/Cargo.toml

@@ -1245,10 +1245,11 @@ impl crate::Surface for Surface {
                         let window_ptr = handle.ns_view.as_ptr();
                         #[cfg(target_os = "macos")]
                         let window_ptr = {
-                            use objc::{msg_send, runtime::Object, sel, sel_impl};
+                            use objc2::msg_send;
+                            use objc2::runtime::AnyObject;
                             // ns_view always have a layer and don't need to verify that it exists.
-                            let layer: *mut Object =
-                                msg_send![handle.ns_view.as_ptr() as *mut Object, layer];
+                            let layer: *mut AnyObject =
+                                msg_send![handle.ns_view.as_ptr() as *mut AnyObject, layer];
                             layer as *mut ffi::c_void
                         };
                         window_ptr