diff --git a/deno_webgpu/buffer.rs b/deno_webgpu/buffer.rs index 97c20850c..e6a99e295 100644 --- a/deno_webgpu/buffer.rs +++ b/deno_webgpu/buffer.rs @@ -36,7 +36,10 @@ pub enum BufferError { Canceled(#[from] oneshot::Canceled), #[class("DOMExceptionOperationError")] #[error(transparent)] - Access(#[from] wgpu_core::resource::BufferAccessError), + Access(wgpu_core::resource::BufferAccessError), + #[class("DOMExceptionAbortError")] + #[error("{0}")] + Aborted(&'static str), #[class("DOMExceptionOperationError")] #[error("{0}")] Operation(&'static str), @@ -45,9 +48,18 @@ pub enum BufferError { Other(#[from] JsErrorBox), } -pub struct GPUBuffer { - pub error_handler: super::error::ErrorHandler, +impl From for BufferError { + fn from(err: wgpu_core::resource::BufferAccessError) -> Self { + match err { + wgpu_core::resource::BufferAccessError::Device( + wgpu_core::device::DeviceError::Lost, + ) => BufferError::Aborted("Device lost"), + err => BufferError::Access(err), + } + } +} +pub struct GPUBuffer { pub wgpu_buffer: Arc, pub wgpu_device: Arc, @@ -144,22 +156,14 @@ impl GPUBuffer { sender.send(status).unwrap(); }); - let err = self - .wgpu_buffer - .map_async( - offset, - size, - wgpu_core::resource::BufferMapOperation { - host: mode, - callback: Some(callback), - }, - ) - .err(); - - if err.is_some() { - self.error_handler.push_error(err); - return Err(BufferError::Operation("validation error occurred")); - } + self.wgpu_buffer.map_async( + offset, + size, + wgpu_core::resource::BufferMapOperation { + host: mode, + callback: Some(callback), + }, + ); } let done = Rc::new(RefCell::new(false)); diff --git a/deno_webgpu/device.rs b/deno_webgpu/device.rs index 974e560c0..a545411bc 100644 --- a/deno_webgpu/device.rs +++ b/deno_webgpu/device.rs @@ -191,7 +191,6 @@ impl GPUDevice { let wgpu_buffer = self.wgpu_device.create_buffer(&wgpu_descriptor); Ok(GPUBuffer { - error_handler: self.error_handler.clone(), wgpu_buffer, wgpu_device: self.wgpu_device.clone(), label: descriptor.label, diff --git a/wgpu-core-remote/src/global/device.rs b/wgpu-core-remote/src/global/device.rs index ca70828f9..c612b8b49 100644 --- a/wgpu-core-remote/src/global/device.rs +++ b/wgpu-core-remote/src/global/device.rs @@ -1135,7 +1135,7 @@ impl Global { offset: BufferAddress, size: Option, op: BufferMapOperation, - ) -> Result { + ) -> Option { let hub = self.hub.borrow(); let buffer = hub.buffers.get(buffer_id); diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index 615e6a373..b9ec59990 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -674,7 +674,7 @@ impl Buffer { offset: wgt::BufferAddress, size: Option, op: BufferMapOperation, - ) -> Result { + ) -> Option { profiling::scope!("Buffer::map_async"); api_log!( "Buffer::map_async {:?} offset {offset:?} size {size:?} op: {op:?}", @@ -683,11 +683,13 @@ impl Buffer { self.try_map_async(offset, size, op) .map_err(|(mut operation, err)| { + self.device + .handle_error(err.clone(), Some(&self.label), "Buffer::map_async"); if let Some(callback) = operation.callback.take() { - callback(Err(err.clone())); + callback(Err(err)); } - err }) + .ok() } /// Try to schedule buffer mapping. diff --git a/wgpu/src/backend/wgpu_core.rs b/wgpu/src/backend/wgpu_core.rs index 36e963772..77e556e0f 100644 --- a/wgpu/src/backend/wgpu_core.rs +++ b/wgpu/src/backend/wgpu_core.rs @@ -1704,16 +1704,8 @@ impl dispatch::BufferInterface for CoreBuffer { })), }; - match self - .wgpu_buffer - .map_async(range.start, Some(range.end - range.start), operation) - { - Ok(_) => (), - Err(cause) => self - .wgpu_buffer - .device() - .handle_error_nolabel(cause, "Buffer::map_async"), - } + self.wgpu_buffer + .map_async(range.start, Some(range.end - range.start), operation); } fn get_mapped_range(