nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-21 22:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

add new Instance::as_hal fn

Browse Source
This commit is contained in:
teoxoy 2024-09-12 11:31:53 +02:00 committed by Teodor Tanasoaia
parent f2faf609af
commit 40206ce4d7
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wgpu-core/src/global.rs
View File

@ -61,13 +61,7 @@ impl Global {
/// ///
/// - The raw instance handle returned must not be manually destroyed. /// - The raw instance handle returned must not be manually destroyed.
pub unsafe fn instance_as_hal<A: HalApi>(&self) -> Option<&A::Instance> { pub unsafe fn instance_as_hal<A: HalApi>(&self) -> Option<&A::Instance> {
self.instance.raw(A::VARIANT).map(|instance| { unsafe { self.instance.as_hal::<A>() }
instance
.as_any()
.downcast_ref()
// This should be impossible. It would mean that backend instance and enum type are mismatching.
.expect("Stored instance is not of the correct type")
})
} }
/// # Safety /// # Safety

27
wgpu-core/src/instance.rs
View File

@ -121,6 +121,19 @@ impl Instance {
(*instance_backend == backend).then(|| instance.as_ref()) (*instance_backend == backend).then(|| instance.as_ref())
}) })
} }
/// # Safety
///
/// - The raw instance handle returned must not be manually destroyed.
pub unsafe fn as_hal<A: HalApi>(&self) -> Option<&A::Instance> {
self.raw(A::VARIANT).map(|instance| {
instance
.as_any()
.downcast_ref()
// This should be impossible. It would mean that backend instance and enum type are mismatching.
.expect("Stored instance is not of the correct type")
})
}
} }
pub struct Surface { pub struct Surface {
@ -463,11 +476,8 @@ impl Global {
) -> Result<SurfaceId, CreateSurfaceError> { ) -> Result<SurfaceId, CreateSurfaceError> {
profiling::scope!("Instance::create_surface_metal"); profiling::scope!("Instance::create_surface_metal");
let instance = self let instance = unsafe { self.instance.as_hal::<hal::api::Metal>() }
.instance
.raw(Backend::Metal)
.ok_or(CreateSurfaceError::BackendNotEnabled(Backend::Metal))?; .ok_or(CreateSurfaceError::BackendNotEnabled(Backend::Metal))?;
let instance_metal: &hal::metal::Instance = instance.as_any().downcast_ref().unwrap();
let layer = layer.cast(); let layer = layer.cast();
// SAFETY: We do this cast and deref. (rather than using `metal` to get the // SAFETY: We do this cast and deref. (rather than using `metal` to get the
@ -483,7 +493,7 @@ impl Global {
// lexical scope. // lexical scope.
let layer = unsafe { &*layer }; let layer = unsafe { &*layer };
let raw_surface: Box<dyn hal::DynSurface> = let raw_surface: Box<dyn hal::DynSurface> =
Box::new(instance_metal.create_surface_from_layer(layer)); Box::new(instance.create_surface_from_layer(layer));
let surface = Surface { let surface = Surface {
presentation: Mutex::new(rank::SURFACE_PRESENTATION, None), presentation: Mutex::new(rank::SURFACE_PRESENTATION, None),
@ -500,12 +510,9 @@ impl Global {
id_in: Option<SurfaceId>, id_in: Option<SurfaceId>,
create_surface_func: impl FnOnce(&hal::dx12::Instance) -> hal::dx12::Surface, create_surface_func: impl FnOnce(&hal::dx12::Instance) -> hal::dx12::Surface,
) -> Result<SurfaceId, CreateSurfaceError> { ) -> Result<SurfaceId, CreateSurfaceError> {
let instance = self let instance = unsafe { self.instance.as_hal::<hal::api::Dx12>() }
.instance
.raw(Backend::Dx12)
.ok_or(CreateSurfaceError::BackendNotEnabled(Backend::Dx12))?; .ok_or(CreateSurfaceError::BackendNotEnabled(Backend::Dx12))?;
let instance_dx12 = instance.as_any().downcast_ref().unwrap(); let surface: Box<dyn hal::DynSurface> = Box::new(create_surface_func(instance));
let surface: Box<dyn hal::DynSurface> = Box::new(create_surface_func(instance_dx12));
let surface = Surface { let surface = Surface {
presentation: Mutex::new(rank::SURFACE_PRESENTATION, None), presentation: Mutex::new(rank::SURFACE_PRESENTATION, None),