nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-10-30 14:01:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle user callbacks in surface_configure (#4220)

Browse Source
This commit is contained in:
Nicolas Silva 2023-10-09 18:06:00 +02:00 committed by GitHub
parent 51742e4353
commit 651299b870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wgpu-core/src/device/global.rs
View File

@ -2262,15 +2262,19 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
Ok(())
}
log::info!("configuring surface with {:?}", config);
let hub = A::hub(self);
let mut token = Token::root();
// User callbacks must not be called while we are holding locks.
let mut user_callbacks = None;
let (mut surface_guard, mut token) = self.surfaces.write(&mut token);
let (adapter_guard, mut token) = hub.adapters.read(&mut token);
let (device_guard, mut token) = hub.devices.read(&mut token);
log::info!("configuring surface with {:?}", config);
let error = 'outer: loop {
let hub = A::hub(self);
let mut token = Token::root();
let (mut surface_guard, mut token) = self.surfaces.write(&mut token);
let (adapter_guard, mut token) = hub.adapters.read(&mut token);
let (device_guard, mut token) = hub.devices.read(&mut token);
let device = match device_guard.get(device_id) {
Ok(device) => device,
Err(_) => break DeviceError::Invalid.into(),
@ -2346,8 +2350,13 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
}
// Wait for all work to finish before configuring the surface.
if let Err(e) = device.maintain(hub, wgt::Maintain::Wait, &mut token) {
break e.into();
match device.maintain(hub, wgt::Maintain::Wait, &mut token) {
Ok((closures, _)) => {
user_callbacks = Some(closures);
}
Err(e) => {
break e.into();
}
}
// All textures must be destroyed before the surface can be re-configured.
@ -2395,6 +2404,10 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
return None;
};
if let Some(callbacks) = user_callbacks {
callbacks.fire();
}
Some(error)
}