Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle user callbacks in surface_configure #4220

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Handle user callbacks in surface_configure #4220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions wgpu-core/src/device/global.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2256,15 +2256,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(),
Expand Down Expand Up @@ -2340,8 +2344,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.
Expand Down Expand Up @@ -2389,6 +2398,10 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
return None;
};

if let Some(callbacks) = user_callbacks {
callbacks.fire();
}

Some(error)
}

Expand Down