From 6066e069d141d7c0c19e088011fdf3c06782d12c Mon Sep 17 00:00:00 2001
From: Leo Kettmeir <crowlkats@toaxl.com>
Date: Fri, 10 May 2024 04:10:22 -0700
Subject: fix(ext/webgpu): invalidate GPUAdapter when a device is created
 (#23752)

This removes the need for using `Deno.resources` to close the gpuadapter
resource, while being more spec compliant.
---
 ext/webgpu/lib.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'ext/webgpu/lib.rs')

diff --git a/ext/webgpu/lib.rs b/ext/webgpu/lib.rs
index eeaae2dd6..8a423fd00 100644
--- a/ext/webgpu/lib.rs
+++ b/ext/webgpu/lib.rs
@@ -673,7 +673,7 @@ pub fn op_webgpu_request_device(
 ) -> Result<GpuDeviceRes, AnyError> {
   let mut state = state.borrow_mut();
   let adapter_resource =
-    state.resource_table.get::<WebGpuAdapter>(adapter_rid)?;
+    state.resource_table.take::<WebGpuAdapter>(adapter_rid)?;
   let adapter = adapter_resource.1;
   let instance = state.borrow::<Instance>();
 
@@ -690,6 +690,7 @@ pub fn op_webgpu_request_device(
     None,
     None
   ));
+  adapter_resource.close();
   if let Some(err) = maybe_err {
     return Err(DomExceptionOperationError::new(&err.to_string()).into());
   }
@@ -731,13 +732,14 @@ pub fn op_webgpu_request_adapter_info(
   state: Rc<RefCell<OpState>>,
   #[smi] adapter_rid: ResourceId,
 ) -> Result<GPUAdapterInfo, AnyError> {
-  let state = state.borrow_mut();
+  let mut state = state.borrow_mut();
   let adapter_resource =
-    state.resource_table.get::<WebGpuAdapter>(adapter_rid)?;
+    state.resource_table.take::<WebGpuAdapter>(adapter_rid)?;
   let adapter = adapter_resource.1;
   let instance = state.borrow::<Instance>();
 
   let info = gfx_select!(adapter => instance.adapter_get_info(adapter))?;
+  adapter_resource.close();
 
   Ok(GPUAdapterInfo {
     vendor: info.vendor.to_string(),
-- 
cgit v1.2.3