introduce DynInstance

wgpu-hal/src/dx12/mod.rs

@@ -98,6 +98,7 @@ crate::impl_dyn_resource!(
     ComputePipeline,
     Device,
     Fence,
+    Instance,
     PipelineCache,
     PipelineLayout,
     QuerySet,

wgpu-hal/src/dynamic/instance.rs

@@ -0,0 +1,53 @@
+// Box casts are needed, alternative would be a temporaries which are more verbose and not more expressive.
+#![allow(trivial_casts)]
+
+use crate::{Capabilities, Instance, InstanceError};
+
+use super::{DynAdapter, DynResource, DynResourceExt as _, DynSurface};
+
+pub struct DynExposedAdapter {
+    pub adapter: Box<dyn DynAdapter>,
+    pub info: wgt::AdapterInfo,
+    pub features: wgt::Features,
+    pub capabilities: Capabilities,
+}
+
+pub trait DynInstance: DynResource {
+    unsafe fn create_surface(
+        &self,
+        display_handle: raw_window_handle::RawDisplayHandle,
+        window_handle: raw_window_handle::RawWindowHandle,
+    ) -> Result<Box<dyn DynSurface>, InstanceError>;
+
+    unsafe fn enumerate_adapters(
+        &self,
+        surface_hint: Option<&dyn DynSurface>,
+    ) -> Vec<DynExposedAdapter>;
+}
+
+impl<I: Instance + DynResource> DynInstance for I {
+    unsafe fn create_surface(
+        &self,
+        display_handle: raw_window_handle::RawDisplayHandle,
+        window_handle: raw_window_handle::RawWindowHandle,
+    ) -> Result<Box<dyn DynSurface>, InstanceError> {
+        unsafe { I::create_surface(self, display_handle, window_handle) }
+            .map(|surface| Box::new(surface) as Box<dyn DynSurface>)
+    }
+
+    unsafe fn enumerate_adapters(
+        &self,
+        surface_hint: Option<&dyn DynSurface>,
+    ) -> Vec<DynExposedAdapter> {
+        let surface_hint = surface_hint.map(|s| s.expect_downcast_ref());
+        unsafe { I::enumerate_adapters(self, surface_hint) }
+            .into_iter()
+            .map(|exposed| DynExposedAdapter {
+                adapter: Box::new(exposed.adapter),
+                info: exposed.info,
+                features: exposed.features,
+                capabilities: exposed.capabilities,
+            })
+            .collect()
+    }
+}

wgpu-hal/src/dynamic/mod.rs

@@ -1,12 +1,14 @@
 mod adapter;
 mod command;
 mod device;
+mod instance;
 mod queue;
 mod surface;
 
 pub use adapter::{DynAdapter, DynOpenDevice};
 pub use command::DynCommandEncoder;
 pub use device::DynDevice;
+pub use instance::{DynExposedAdapter, DynInstance};
 pub use queue::DynQueue;
 pub use surface::{DynAcquiredSurfaceTexture, DynSurface};
 

wgpu-hal/src/gles/mod.rs

@@ -175,6 +175,7 @@ crate::impl_dyn_resource!(
     ComputePipeline,
     Device,
     Fence,
+    Instance,
     PipelineCache,
     PipelineLayout,
     QuerySet,

wgpu-hal/src/lib.rs

@@ -268,9 +268,9 @@ pub(crate) use dynamic::impl_dyn_resource;
 pub use dynamic::{
     DynAccelerationStructure, DynAcquiredSurfaceTexture, DynAdapter, DynBindGroup,
     DynBindGroupLayout, DynBuffer, DynCommandBuffer, DynCommandEncoder, DynComputePipeline,
-    DynDevice, DynFence, DynOpenDevice, DynPipelineCache, DynPipelineLayout, DynQuerySet, DynQueue,
-    DynRenderPipeline, DynResource, DynSampler, DynShaderModule, DynSurface, DynSurfaceTexture,
-    DynTexture, DynTextureView,
+    DynDevice, DynExposedAdapter, DynFence, DynInstance, DynOpenDevice, DynPipelineCache,
+    DynPipelineLayout, DynQuerySet, DynQueue, DynRenderPipeline, DynResource, DynSampler,
+    DynShaderModule, DynSurface, DynSurfaceTexture, DynTexture, DynTextureView,
 };
 
 use std::{
@@ -390,7 +390,7 @@ impl InstanceError {
 }
 
 pub trait Api: Clone + fmt::Debug + Sized {
-    type Instance: Instance<A = Self>;
+    type Instance: DynInstance + Instance<A = Self>;
     type Surface: DynSurface + Surface<A = Self>;
     type Adapter: DynAdapter + Adapter<A = Self>;
     type Device: DynDevice + Device<A = Self>;

wgpu-hal/src/metal/mod.rs

@@ -82,6 +82,7 @@ crate::impl_dyn_resource!(
     ComputePipeline,
     Device,
     Fence,
+    Instance,
     PipelineCache,
     PipelineLayout,
     QuerySet,

wgpu-hal/src/vulkan/mod.rs

@@ -89,6 +89,7 @@ crate::impl_dyn_resource!(
     ComputePipeline,
     Device,
     Fence,
+    Instance,
     PipelineCache,
     PipelineLayout,
     QuerySet,