nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-10-29 21:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[d3d12] Avoid panic on instance drop (#5134)

Browse Source
This commit is contained in:
Okko Hakola 2024-01-24 13:49:18 +02:00 committed by GitHub
parent 6440af03a6
commit b3490de69d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -71,6 +71,9 @@ Bottom level categories:
### Bug Fixes
#### General
- Fix `panic!` when dropping `Instance` without `InstanceFlags::VALIDATION`. By @hakolao in [#5134](https://github.com/gfx-rs/wgpu/pull/5134)
#### WGL
- In Surface::configure and Surface::present, fix the current GL context not being unset when releasing the lock that guards access to making the context current. This was causing other threads to panic when trying to make the context current. By @Imberflur in [#5087](https://github.com/gfx-rs/wgpu/pull/5087).

4
wgpu-hal/src/dx12/instance.rs
View File

@ -7,7 +7,9 @@ use std::{mem, sync::Arc};
impl Drop for super::Instance {
fn drop(&mut self) {
crate::auxil::dxgi::exception::unregister_exception_handler();
if self.flags.contains(wgt::InstanceFlags::VALIDATION) {
crate::auxil::dxgi::exception::unregister_exception_handler();
}
}
}