Revert "[metal] Improve layer initialization and resizing (gfx-rs#6107)"

This reverts commit 54c801c.
ArthurBrussee · Sep 16, 2024 · d7c0678 · d7c0678
1 parent 6af6146
commit d7c0678
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 242 deletions.
diff --git a/wgpu-hal/src/metal/mod.rs b/wgpu-hal/src/metal/mod.rs
@@ -71,32 +71,9 @@ impl crate::Api for Api {
     type AccelerationStructure = AccelerationStructure;
 }
 
-crate::impl_dyn_resource!(
-    Adapter,
-    AccelerationStructure,
-    BindGroup,
-    BindGroupLayout,
-    Buffer,
-    CommandBuffer,
-    CommandEncoder,
-    ComputePipeline,
-    Device,
-    Fence,
-    Instance,
-    PipelineCache,
-    PipelineLayout,
-    QuerySet,
-    Queue,
-    RenderPipeline,
-    Sampler,
-    ShaderModule,
-    Surface,
-    SurfaceTexture,
-    Texture,
-    TextureView
-);
-
-pub struct Instance {}
+pub struct Instance {
+    managed_metal_layer_delegate: surface::HalManagedMetalLayerDelegate,
+}
 
 impl Instance {
     pub fn create_surface_from_layer(&self, layer: &metal::MetalLayerRef) -> Surface {
@@ -111,7 +88,9 @@ impl crate::Instance for Instance {
         profiling::scope!("Init Metal Backend");
         // We do not enable metal validation based on the validation flags as it affects the entire
         // process. Instead, we enable the validation inside the test harness itself in tests/src/native.rs.
-        Ok(Instance {})
+        Ok(Instance {
+            managed_metal_layer_delegate: surface::HalManagedMetalLayerDelegate::new(),
+        })
     }
 
     unsafe fn create_surface(
@@ -122,12 +101,16 @@ impl crate::Instance for Instance {
         match window_handle {
             #[cfg(target_os = "ios")]
             raw_window_handle::RawWindowHandle::UiKit(handle) => {
-                Ok(unsafe { Surface::from_view(handle.ui_view.cast()) })
+                let _ = &self.managed_metal_layer_delegate;
+                Ok(unsafe { Surface::from_view(handle.ui_view.as_ptr(), None) })
             }
             #[cfg(target_os = "macos")]
-            raw_window_handle::RawWindowHandle::AppKit(handle) => {
-                Ok(unsafe { Surface::from_view(handle.ns_view.cast()) })
-            }
+            raw_window_handle::RawWindowHandle::AppKit(handle) => Ok(unsafe {
+                Surface::from_view(
+                    handle.ns_view.as_ptr(),
+                    Some(&self.managed_metal_layer_delegate),
+                )
+            }),
             _ => Err(crate::InstanceError::new(format!(
                 "window handle {window_handle:?} is not a Metal-compatible handle"
             ))),
@@ -364,6 +347,7 @@ pub struct Device {
 }
 
 pub struct Surface {
+    view: Option<NonNull<objc::runtime::Object>>,
     render_layer: Mutex<metal::MetalLayer>,
     swapchain_format: RwLock<Option<wgt::TextureFormat>>,
     extent: RwLock<wgt::Extent3d>,