Skip to content

fix(core): Check for device loss on all submit paths #9478

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

Merged
teoxoy merged 1 commit into from
May 6, 2026
+20 −10
Merged

fix(core): Check for device loss on all submit paths #9478

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
30 changes: 20 additions & 10 deletions wgpu-core/src/device/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ impl Queue {
texture: &Arc<Texture>,
) -> Result<(), DeviceError> {
let snatch_guard = self.device.snatchable_lock.read();
let (mut submission, _index) = self.allocate_submission(snatch_guard);
let mut submission = self
.allocate_submission(snatch_guard)
.map_err(|(_index, e)| e)?;
let device = &self.device;

// If the texture is uninitialized it needs to be cleared before presenting
Expand Down Expand Up @@ -1253,7 +1255,9 @@ impl Queue {
buffer: &Arc<Buffer>,
snatch_guard: SnatchGuard,
) -> Result<(), BufferAccessError> {
let (submission, _index) = self.allocate_submission(snatch_guard);
let submission = self
.allocate_submission(snatch_guard)
.map_err(|(_index, e)| e)?;

let pending_writes = self.pending_writes.lock();
if !pending_writes.contains_buffer(buffer) {
Expand All @@ -1267,7 +1271,10 @@ impl Queue {

fn flush_pending_writes(&self) -> Result<Option<SubmissionIndex>, DeviceError> {
let snatch_guard = self.device.snatchable_lock.read();
let (submission, submit_index) = self.allocate_submission(snatch_guard);
let submission = self
.allocate_submission(snatch_guard)
.map_err(|(_index, e)| e)?;
let submit_index = submission.index;
let pending_writes = self.pending_writes.lock();
if pending_writes.is_recording {
submission.submit(pending_writes)?;
Expand Down Expand Up @@ -1312,13 +1319,12 @@ impl Queue {
api_log!("Queue::submit");

let snatch_guard = self.device.snatchable_lock.read();
let (mut submission, submit_index) = self.allocate_submission(snatch_guard);
let mut submission = self
.allocate_submission(snatch_guard)
.map_err(|(index, e)| (index, e.into()))?;
let submit_index = submission.index;

let res = 'error: {
if let Err(e) = self.device.check_is_valid() {
break 'error Err(e.into());
}

let mut used_surface_textures = track::TextureUsageScope::default();

{
Expand Down Expand Up @@ -1554,7 +1560,7 @@ impl Queue {
fn allocate_submission<'a>(
&'a self,
snatch_guard: SnatchGuard<'a>,
) -> (PendingSubmission<'a>, SubmissionIndex) {
) -> Result<PendingSubmission<'a>, (SubmissionIndex, DeviceError)> {
// Lock ordering requires that the fence lock be acquired after the snatch lock and
// before the command index lock.
let fence = self.device.fence.write();
Expand All @@ -1563,6 +1569,10 @@ impl Queue {
command_index_guard.active_submission_index += 1;
let index = command_index_guard.active_submission_index;

if let Err(e) = self.device.check_is_valid() {
return Err((index, e));
}

let submission = PendingSubmission {
queue: self,
snatch_guard,
Expand All @@ -1573,7 +1583,7 @@ impl Queue {
index,
};

(submission, index)
Ok(submission)
}

/// Finalize and submit a [`PendingSubmission`] that was returned by
Expand Down