diff --git a/deno_webgpu/device.rs b/deno_webgpu/device.rs index 4e0a3ed65..a9d96cc16 100644 --- a/deno_webgpu/device.rs +++ b/deno_webgpu/device.rs @@ -732,7 +732,7 @@ impl GPUDevice { .scopes .lock() .unwrap() - .push((filter, vec![])); + .push((filter, None)); } #[async_method(fake)] @@ -746,7 +746,7 @@ impl GPUDevice { return Ok(v8::Global::new(scope, val)); } - let Some((_, errors)) = self.error_handler.scopes.lock().unwrap().pop() + let Some((_, error)) = self.error_handler.scopes.lock().unwrap().pop() else { return Err(JsErrorBox::new( "DOMExceptionOperationError", @@ -754,7 +754,7 @@ impl GPUDevice { )); }; - let val = if let Some(err) = errors.into_iter().next() { + let val = if let Some(err) = error { deno_core::error::to_v8_error(scope, &err) } else { v8::null(scope).into() diff --git a/deno_webgpu/error.rs b/deno_webgpu/error.rs index 534ca94fa..9397fba7a 100644 --- a/deno_webgpu/error.rs +++ b/deno_webgpu/error.rs @@ -45,7 +45,7 @@ pub type ErrorHandler = std::rc::Rc; pub struct DeviceErrorHandler { pub is_lost: OnceLock<()>, - pub scopes: Mutex)>>, + pub scopes: Mutex)>>, lost_resolver: Mutex>>, spawner: V8TaskSpawner, @@ -111,7 +111,10 @@ impl DeviceErrorHandler { .rfind(|(filter, _)| filter == &error_filter); if let Some(scope) = scope { - scope.1.push(err); + // Only saving the first error in the scope as it's likely the culprit. + if scope.1.is_none() { + scope.1 = Some(err); + } } else { let device = self .device