Fix label leak (#3053)

gfx-rs · Sep 27, 2022 · c927e81 · c927e81
1 parent b65ebb4
commit c927e81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wgpu-hal/src/metal/command.rs b/wgpu-hal/src/metal/command.rs
@@ -102,12 +102,12 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
             } else {
                 queue.new_command_buffer_with_unretained_references()
             };
+            if let Some(label) = label {
+                cmd_buf_ref.set_label(label);
+            }
             cmd_buf_ref.to_owned()
         });
 
-        if let Some(label) = label {
-            raw.set_label(label);
-        }
         self.raw_cmd_buf = Some(raw);
 
         Ok(())

diff --git a/wgpu-hal/src/metal/device.rs b/wgpu-hal/src/metal/device.rs
@@ -376,7 +376,9 @@ impl crate::Device<super::Api> for super::Device {
                 },
             );
             if let Some(label) = desc.label {
-                raw.set_label(label);
+                objc::rc::autoreleasepool(|| {
+                    raw.set_label(label);
+                });
             }
             raw
         };