Expose WinUI SwapChainPanel as a surface source type (#480)

* Expose WinUI SwapChainPanel as a surface source type

* Include SwapChainPanel only on windows

* fix formatting

---------

Co-authored-by: Almar Klein <[email protected]>

Author: leksiso

ffi/wgpu.h

@@ -14,6 +14,7 @@ typedef enum WGPUNativeSType {
     WGPUSType_BindGroupLayoutEntryExtras = 0x00030008,
     WGPUSType_QuerySetDescriptorExtras = 0x00030009,
     WGPUSType_SurfaceConfigurationExtras = 0x0003000A,
+    WGPUSType_SurfaceSourceSwapChainPanel = 0x0003000B,
     WGPUNativeSType_Force32 = 0x7FFFFFFF
 } WGPUNativeSType;
 
@@ -256,6 +257,18 @@ typedef struct WGPUSurfaceConfigurationExtras {
     uint32_t desiredMaximumFrameLatency;
 } WGPUSurfaceConfigurationExtras WGPU_STRUCTURE_ATTRIBUTE;
 
+/**
+ * Chained in @ref WGPUSurfaceDescriptor to make a @ref WGPUSurface wrapping a WinUI [`SwapChainPanel`](https://learn.microsoft.com/en-us/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.swapchainpanel).
+ */
+typedef struct WGPUSurfaceSourceSwapChainPanel {
+    WGPUChainedStruct chain;
+    /**
+     * A pointer to the [`ISwapChainPanelNative`](https://learn.microsoft.com/en-us/windows/windows-app-sdk/api/win32/microsoft.ui.xaml.media.dxinterop/nn-microsoft-ui-xaml-media-dxinterop-iswapchainpanelnative)
+     * interface of the SwapChainPanel that will be wrapped by the @ref WGPUSurface.
+     */
+    void * panelNative;
+} WGPUSurfaceSourceSwapChainPanel WGPU_STRUCTURE_ATTRIBUTE;
+
 typedef void (*WGPULogCallback)(WGPULogLevel level, WGPUStringView message, void * userdata);
 
 typedef enum WGPUNativeTextureFormat {

src/conv.rs

@@ -1603,6 +1603,8 @@ pub enum CreateSurfaceParams {
     ),
     #[cfg(all(any(target_os = "ios", target_os = "macos"), feature = "metal"))]
     Metal(*mut std::ffi::c_void),
+    #[cfg(all(target_os = "windows", feature = "dx12"))]
+    SwapChainPanel(*mut std::ffi::c_void),
 }
 
 pub unsafe fn map_surface(
@@ -1613,6 +1615,7 @@ pub unsafe fn map_surface(
     wl: Option<&native::WGPUSurfaceSourceWaylandSurface>,
     _metal: Option<&native::WGPUSurfaceSourceMetalLayer>,
     android: Option<&native::WGPUSurfaceSourceAndroidNativeWindow>,
+    _swap_chain_panel: Option<&native::WGPUSurfaceSourceSwapChainPanel>,
 ) -> CreateSurfaceParams {
     if let Some(win) = win {
         let display_handle = raw_window_handle::WindowsDisplayHandle::new();
@@ -1677,6 +1680,11 @@ pub unsafe fn map_surface(
         ));
     }
 
+    #[cfg(all(target_os = "windows", feature = "dx12"))]
+    if let Some(swap_chain_panel) = _swap_chain_panel {
+        return CreateSurfaceParams::SwapChainPanel(swap_chain_panel.panelNative);
+    }
+
     panic!("Error: Unsupported Surface");
 }
 

src/lib.rs

@@ -2657,7 +2657,8 @@ pub unsafe extern "C" fn wgpuInstanceCreateSurface(
             WGPUSType_SurfaceSourceXlibWindow => native::WGPUSurfaceSourceXlibWindow,
             WGPUSType_SurfaceSourceWaylandSurface => native::WGPUSurfaceSourceWaylandSurface,
             WGPUSType_SurfaceSourceMetalLayer => native::WGPUSurfaceSourceMetalLayer,
-            WGPUSType_SurfaceSourceAndroidNativeWindow => native::WGPUSurfaceSourceAndroidNativeWindow)
+            WGPUSType_SurfaceSourceAndroidNativeWindow => native::WGPUSurfaceSourceAndroidNativeWindow,
+            WGPUSType_SurfaceSourceSwapChainPanel => native::WGPUSurfaceSourceSwapChainPanel)
     );
 
     let surface_id = match create_surface_params {
@@ -2674,6 +2675,13 @@ pub unsafe extern "C" fn wgpuInstanceCreateSurface(
                 Err(cause) => handle_error_fatal(cause, "wgpuInstanceCreateSurface"),
             }
         }
+        #[cfg(all(target_os = "windows", feature = "dx12"))]
+        CreateSurfaceParams::SwapChainPanel(panel) => {
+            match context.instance_create_surface_from_swap_chain_panel(panel, None) {
+                Ok(surface_id) => surface_id,
+                Err(cause) => handle_error_fatal(cause, "wgpuInstanceCreateSurface"),
+            }
+        }
     };
 
     Arc::into_raw(Arc::new(WGPUSurfaceImpl {