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

[d3d12] handle known error variants returned by D3D12CreateDevice (#6241)

Browse Source
This commit is contained in:
Teodor Tanasoaia 2024-09-09 15:01:24 +02:00 committed by GitHub
parent fb0cb1eb11
commit 055372902d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgpu-hal/src/dx12/adapter.rs
View File

@ -66,7 +66,7 @@ impl super::Adapter {
profiling::scope!("ID3D12Device::create_device");
library
.create_device(&adapter, Direct3D::D3D_FEATURE_LEVEL_11_0)
.ok()?
.ok()??
};
profiling::scope!("feature queries");

21
wgpu-hal/src/dx12/mod.rs
View File

@ -108,7 +108,7 @@ impl D3D12Lib {
&self,
adapter: &DxgiAdapter,
feature_level: Direct3D::D3D_FEATURE_LEVEL,
) -> Result<Direct3D12::ID3D12Device, crate::DeviceError> {
) -> Result<Option<Direct3D12::ID3D12Device>, crate::DeviceError> {
// Calls windows::Win32::Graphics::Direct3D12::D3D12CreateDevice on d3d12.dll
type Fun = extern "system" fn(
padapter: *mut core::ffi::c_void,
@ -118,19 +118,28 @@ impl D3D12Lib {
) -> windows_core::HRESULT;
let func: libloading::Symbol<Fun> = unsafe { self.lib.get(b"D3D12CreateDevice\0") }?;
let mut result__ = None;
let mut result__: Option<Direct3D12::ID3D12Device> = None;
(func)(
let res = (func)(
adapter.as_raw(),
feature_level,
// TODO: Generic?
&Direct3D12::ID3D12Device::IID,
<*mut _>::cast(&mut result__),
)
.ok()
.into_device_result("Device creation")?;
.ok();
result__.ok_or(crate::DeviceError::Unexpected)
if let Err(ref err) = res {
match err.code() {
Dxgi::DXGI_ERROR_UNSUPPORTED => return Ok(None),
Dxgi::DXGI_ERROR_DRIVER_INTERNAL_ERROR => return Err(crate::DeviceError::Lost),
_ => {}
}
}
res.into_device_result("Device creation")?;
result__.ok_or(crate::DeviceError::Unexpected).map(Some)
}
fn serialize_root_signature(