Fix setLabel calls

Author: madsmtm

wgpu-hal/src/metal/device.rs

@@ -1,14 +1,14 @@
-use objc2::{msg_send, msg_send_id, rc::Retained, runtime::ProtocolObject};
+use objc2::{msg_send_id, rc::Retained, runtime::ProtocolObject};
 use objc2_foundation::{ns_string, NSError, NSRange, NSString};
 use objc2_metal::{
     MTLBuffer, MTLCaptureManager, MTLCaptureScope, MTLCommandBuffer, MTLCommandBufferStatus,
     MTLCompileOptions, MTLComputePipelineDescriptor, MTLComputePipelineState,
     MTLCounterSampleBufferDescriptor, MTLCounterSet, MTLDepthClipMode, MTLDepthStencilDescriptor,
     MTLDevice, MTLFunction, MTLLanguageVersion, MTLLibrary, MTLMutability,
     MTLPipelineBufferDescriptorArray, MTLPixelFormat, MTLPrimitiveTopologyClass,
-    MTLRenderPipelineDescriptor, MTLResourceOptions, MTLSamplerAddressMode, MTLSamplerDescriptor,
-    MTLSamplerMipFilter, MTLSize, MTLStencilDescriptor, MTLStorageMode, MTLTexture,
-    MTLTextureDescriptor, MTLTextureType, MTLTriangleFillMode, MTLVertexDescriptor,
+    MTLRenderPipelineDescriptor, MTLResource, MTLResourceOptions, MTLSamplerAddressMode,
+    MTLSamplerDescriptor, MTLSamplerMipFilter, MTLSize, MTLStencilDescriptor, MTLStorageMode,
+    MTLTexture, MTLTextureDescriptor, MTLTextureType, MTLTriangleFillMode, MTLVertexDescriptor,
     MTLVertexStepFunction,
 };
 use parking_lot::Mutex;
@@ -332,7 +332,7 @@ impl crate::Device for super::Device {
                 .newBufferWithLength_options(desc.size as usize, options)
                 .unwrap();
             if let Some(label) = desc.label {
-                set_buffer_label(&raw, Some(&NSString::from_str(label)));
+                raw.setLabel(Some(&NSString::from_str(label)));
             }
             Ok(super::Buffer {
                 raw,
@@ -403,7 +403,7 @@ impl crate::Device for super::Device {
                 .newTextureWithDescriptor(&descriptor)
                 .ok_or(crate::DeviceError::OutOfMemory)?;
             if let Some(label) = desc.label {
-                set_texture_label(&raw, Some(&NSString::from_str(label)));
+                raw.setLabel(Some(&NSString::from_str(label)));
             }
 
             Ok(super::Texture {
@@ -474,7 +474,7 @@ impl crate::Device for super::Device {
                     )
                     .unwrap();
                 if let Some(label) = desc.label {
-                    set_texture_label(&raw, Some(&NSString::from_str(label)));
+                    raw.setLabel(Some(&NSString::from_str(label)));
                 }
                 raw
             })
@@ -1155,7 +1155,7 @@ impl crate::Device for super::Device {
                         .newBufferWithLength_options(size as usize, options)
                         .unwrap();
                     if let Some(label) = desc.label {
-                        set_buffer_label(&raw_buffer, Some(&NSString::from_str(label)));
+                        raw_buffer.setLabel(Some(&NSString::from_str(label)));
                     }
                     Ok(super::QuerySet {
                         raw_buffer,
@@ -1313,16 +1313,6 @@ impl crate::Device for super::Device {
     }
 }
 
-// TODO: `label` is not exposed on `MTLBuffer`, is this always correct?
-fn set_buffer_label(buffer: &ProtocolObject<dyn MTLBuffer>, label: Option<&NSString>) {
-    unsafe { msg_send![buffer, setLabel: label] }
-}
-
-// TODO: `label` is not exposed on `MTLTexture`, is this always correct?
-fn set_texture_label(buffer: &ProtocolObject<dyn MTLTexture>, label: Option<&NSString>) {
-    unsafe { msg_send![buffer, setLabel: label] }
-}
-
 // TODO: `newComputePipelineStateWithDescriptor:error:` is not exposed on
 // `MTLDevice`, is this always correct?
 fn new_compute_pipeline_state_with_descriptor(