From e04cd38d590e1c00fcfdc2ed9b79baa8f678d029 Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Sat, 24 Oct 2026 14:02:07 +0200 Subject: [PATCH] [deno] Call GPUBuffer::unmap procedure on GPUBuffer::destroy Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- deno_webgpu/buffer.rs | 63 +++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/deno_webgpu/buffer.rs b/deno_webgpu/buffer.rs index 57aa4e61b..9f8611a49 100644 --- a/deno_webgpu/buffer.rs +++ b/deno_webgpu/buffer.rs @@ -121,6 +121,39 @@ impl GarbageCollected for GPUBuffer { } } +impl GPUBuffer { + fn unmap_inner( + &self, + scope: &mut v8::HandleScope, + ) -> Result<(), BufferError> { + if let BufferMapState::Mapped { mode, range, views } = + self.map_state.replace(BufferMapState::Unmapped) + { + for ab in views { + let ab = ab.array_buffer.open(scope); + ab.detach(None); + } + + if mode == MapMode::Write { + if let Ok(mapping) = self + .wgpu_buffer + .get_mapped_range(range.start, Some(range.end - range.start)) + { + let data = self.data.borrow(); + let data = data.as_ref().expect("mapAsync succeeded"); + mapping + .write_slice() + .copy_from_slice(&data[range.start as usize..range.end as usize]); + } + } + } + + self.wgpu_buffer.unmap(); + + Ok(()) + } +} + #[op2] impl GPUBuffer { #[constructor] @@ -342,37 +375,15 @@ impl GPUBuffer { #[nofast] #[undefined] fn unmap(&self, scope: &mut v8::HandleScope) -> Result<(), BufferError> { - if let BufferMapState::Mapped { mode, range, views } = - self.map_state.replace(BufferMapState::Unmapped) - { - for ab in views { - let ab = ab.array_buffer.open(scope); - ab.detach(None); - } - - if mode == MapMode::Write { - if let Ok(mapping) = self - .wgpu_buffer - .get_mapped_range(range.start, Some(range.end - range.start)) - { - let data = self.data.borrow(); - let data = data.as_ref().expect("mapAsync succeeded"); - mapping - .write_slice() - .copy_from_slice(&data[range.start as usize..range.end as usize]); - } - } - } - - self.wgpu_buffer.unmap(); - - Ok(()) + self.unmap_inner(scope) } #[fast] #[undefined] - fn destroy(&self) { + fn destroy(&self, scope: &mut v8::HandleScope) -> Result<(), BufferError> { + self.unmap_inner(scope)?; self.data.replace(None); self.wgpu_buffer.destroy(); + Ok(()) } }