Make wrappers separate

framework-crates/objc2-metal/examples/triangle.rs

@@ -15,8 +15,9 @@ use objc2_foundation::{
     ns_string, NSDate, NSNotification, NSObject, NSObjectProtocol, NSPoint, NSRect, NSSize,
 };
 use objc2_metal::{
-    MTLCommandBuffer, MTLCommandEncoder, MTLCommandQueue, MTLDevice, MTLLibrary, MTLPackedFloat3,
-    MTLPrimitiveType, MTLRenderCommandEncoder, MTLRenderPipelineDescriptor, MTLRenderPipelineState,
+    MTLCommandBuffer, MTLCommandEncoder, MTLCommandQueue, MTLCreateSystemDefaultDevice, MTLDevice,
+    MTLLibrary, MTLPackedFloat3, MTLPrimitiveType, MTLRenderCommandEncoder,
+    MTLRenderPipelineDescriptor, MTLRenderPipelineState,
 };
 use objc2_metal_kit::{MTKView, MTKViewDelegate};
 
@@ -105,7 +106,7 @@ declare_class!(
             };
 
             // get the default device
-            let device = MTLDevice::system_default().expect("Failed to get default system device.");
+            let device = MTLCreateSystemDefaultDevice().expect("Failed to get default system device.");
 
             // create the command queue
             let command_queue = device

framework-crates/objc2-metal/src/device.rs

@@ -3,14 +3,10 @@ use objc2_foundation::NSArray;
 
 use crate::MTLDevice;
 
-pub trait MTLDeviceExt: MTLDevice {
-    fn system_default() -> Option<Id<ProtocolObject<dyn MTLDevice>>> {
-        unsafe { Id::from_raw(crate::MTLCreateSystemDefaultDevice()) }
-    }
-
-    fn all() -> Id<NSArray<ProtocolObject<dyn MTLDevice>>> {
-        unsafe { Id::new_nonnull(crate::MTLCopyAllDevices()) }
-    }
+pub fn MTLCreateSystemDefaultDevice() -> Option<Id<ProtocolObject<dyn MTLDevice>>> {
+    unsafe { Id::from_raw(crate::generated::MTLCreateSystemDefaultDevice()) }
 }
 
-impl<P: MTLDevice> MTLDeviceExt for P {}
+pub fn MTLCopyAllDevices() -> Id<NSArray<ProtocolObject<dyn MTLDevice>>> {
+    unsafe { Id::new_nonnull(crate::generated::MTLCopyAllDevices()) }
+}

framework-crates/objc2-metal/src/lib.rs

@@ -11,7 +11,7 @@
 //!
 //! [apple-doc]: https://developer.apple.com/documentation/xcode/validating-your-apps-metal-api-usage/.
 //!
-//! Note: To use [`MTLDevice::system_default()`] you need to link to
+//! Note: To use [`MTLCreateSystemDefaultDevice()`] you need to link to
 //! `CoreGraphics`, this can be done by using `objc2-app-kit`, or by doing:
 //! ```rust
 //! #[link(name = "CoreGraphics", kind = "framework")]

framework-crates/objc2-metal/tests/runs_with_core_graphics.rs

@@ -1,17 +1,19 @@
 #![cfg(feature = "MTLDevice")]
-use objc2_metal::MTLDevice;
+use objc2_metal::MTLCreateSystemDefaultDevice;
 
 #[link(name = "CoreGraphics", kind = "framework")]
 extern "C" {}
 
 #[test]
 #[ignore = "doesn't work in CI"]
 fn test_create_default() {
-    let _ = MTLDevice::system_default();
+    let _ = MTLCreateSystemDefaultDevice();
 }
 
 #[test]
 #[cfg(target_os = "macos")]
 fn get_all() {
-    let _ = MTLDevice::all();
+    use objc2_metal::MTLCopyAllDevices;
+
+    let _ = MTLCopyAllDevices();
 }