Provide a vulkan path for create_surface_metal

Signed-off-by: Isaac Marovitz <[email protected]>

Author: IsaacMarovitz

wgpu-core/src/instance.rs

@@ -317,31 +317,79 @@ impl Instance {
     ) -> Result<Surface, CreateSurfaceError> {
         profiling::scope!("Instance::create_surface_metal");
 
-        let instance = unsafe { self.as_hal::<hal::api::Metal>() }
-            .ok_or(CreateSurfaceError::BackendNotEnabled(Backend::Metal))?;
+        let mut errors = HashMap::default();
+        let mut surface_per_backend: HashMap<Backend, Box<dyn hal::DynSurface>> =
+            HashMap::default();
 
-        let layer = layer.cast();
-        // SAFETY: We do this cast and deref. (rather than using `metal` to get the
-        // object we want) to avoid direct coupling on the `metal` crate.
-        //
-        // To wit, this pointer…
-        //
-        // - …is properly aligned.
-        // - …is dereferenceable to a `MetalLayerRef` as an invariant of the `metal`
-        //   field.
-        // - …points to an _initialized_ `MetalLayerRef`.
-        // - …is only ever aliased via an immutable reference that lives within this
-        //   lexical scope.
-        let layer = unsafe { &*layer };
-        let raw_surface: Box<dyn hal::DynSurface> =
-            Box::new(instance.create_surface_from_layer(layer));
+        for (backend, instance) in &self.instance_per_backend {
+            match *backend {
+                #[cfg(vulkan)]
+                Backend::Vulkan => {
+                    // Downcast to Vulkan instance
+                    let vk_instance = instance
+                        .as_any()
+                        .downcast_ref::<hal::vulkan::Instance>()
+                        .expect("Backend mismatch");
+
+                    if let Some(mut layer) = core::ptr::NonNull::new(layer) {
+                        unsafe {
+                            match vk_instance.create_surface_from_layer(layer.as_mut()) {
+                                Ok(raw) => {
+                                    surface_per_backend.insert(*backend, Box::new(raw));
+                                }
+                                Err(err) => {
+                                    log::debug!(
+                                    "Instance::create_surface_metal: failed to create Vulkan surface: {err:?}"
+                                );
+                                    errors.insert(*backend, err);
+                                }
+                            }
+                        }
+                    }
+                }
+                #[cfg(metal)]
+                Backend::Metal => {
+                    // Downcast to Metal instance
+                    let metal_instance = instance
+                        .as_any()
+                        .downcast_ref::<hal::metal::Instance>()
+                        .expect("Backend mismatch");
+
+                    let layer_ref = layer.cast();
+                    // SAFETY: We do this cast and deref. (rather than using `metal` to get the
+                    // object we want) to avoid direct coupling on the `metal` crate.
+                    //
+                    // To wit, this pointer…
+                    //
+                    // - …is properly aligned.
+                    // - …is dereferenceable to a `MetalLayerRef` as an invariant of the `metal`
+                    //   field.
+                    // - …points to an _initialized_ `MetalLayerRef`.
+                    // - …is only ever aliased via an immutable reference that lives within this
+                    //   lexical scope.
+                    let layer_ref = unsafe { &*layer_ref };
+                    let raw = metal_instance.create_surface_from_layer(layer_ref);
+                    surface_per_backend.insert(*backend, Box::new(raw));
+                }
+                _ => {
+                    // Other backends don't support Metal layer input
+                    continue;
+                }
+            }
+        }
 
-        let surface = Surface {
-            presentation: Mutex::new(rank::SURFACE_PRESENTATION, None),
-            surface_per_backend: core::iter::once((Backend::Metal, raw_surface)).collect(),
-        };
+        if surface_per_backend.is_empty() {
+            Err(CreateSurfaceError::FailedToCreateSurfaceForAnyBackend(
+                errors,
+            ))
+        } else {
+            let surface = Surface {
+                presentation: Mutex::new(rank::SURFACE_PRESENTATION, None),
+                surface_per_backend,
+            };
 
-        Ok(surface)
+            Ok(surface)
+        }
     }
 
     #[cfg(dx12)]
@@ -955,7 +1003,7 @@ impl Global {
     /// # Safety
     ///
     /// `layer` must be a valid pointer.
-    #[cfg(metal)]
+    #[cfg(any(metal, vulkan))]
     pub unsafe fn instance_create_surface_metal(
         &self,
         layer: *mut core::ffi::c_void,

wgpu-hal/src/vulkan/instance.rs

@@ -519,24 +519,32 @@ impl super::Instance {
     fn create_surface_from_view(
         &self,
         view: core::ptr::NonNull<c_void>,
+    ) -> Result<super::Surface, crate::InstanceError> {
+        let layer = unsafe { crate::metal::Surface::get_metal_layer(view.cast()) };
+        // NOTE: The layer is retained by Vulkan's `vkCreateMetalSurfaceEXT`,
+        // so no need to retain it beyond the scope of this function.
+        let layer_ptr = (*layer).cast();
+
+        self.create_surface_from_layer(layer_ptr)
+    }
+
+    #[cfg(metal)]
+    pub fn create_surface_from_layer(
+        &self,
+        layer: *mut vk::CAMetalLayer,
     ) -> Result<super::Surface, crate::InstanceError> {
         if !self.shared.extensions.contains(&ext::metal_surface::NAME) {
             return Err(crate::InstanceError::new(String::from(
                 "Vulkan driver does not support VK_EXT_metal_surface",
             )));
         }
 
-        let layer = unsafe { crate::metal::Surface::get_metal_layer(view.cast()) };
-        // NOTE: The layer is retained by Vulkan's `vkCreateMetalSurfaceEXT`,
-        // so no need to retain it beyond the scope of this function.
-        let layer_ptr = (*layer).cast();
-
         let surface = {
             let metal_loader =
                 ext::metal_surface::Instance::new(&self.shared.entry, &self.shared.raw);
             let vk_info = vk::MetalSurfaceCreateInfoEXT::default()
                 .flags(vk::MetalSurfaceCreateFlagsEXT::empty())
-                .layer(layer_ptr);
+                .layer(layer);
 
             unsafe { metal_loader.create_metal_surface(&vk_info, None).unwrap() }
         };

wgpu/src/backend/wgpu_core.rs

@@ -817,7 +817,7 @@ impl dispatch::InstanceInterface for ContextWgpuCore {
                 )
             },
 
-            #[cfg(metal)]
+            #[cfg(any(metal, vulkan))]
             SurfaceTargetUnsafe::CoreAnimationLayer(layer) => unsafe {
                 self.0.instance_create_surface_metal(layer, None)
             },