diff options
author | Leo Kettmeir <crowlkats@toaxl.com> | 2024-05-10 04:10:22 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-10 04:10:22 -0700 |
commit | 6066e069d141d7c0c19e088011fdf3c06782d12c (patch) | |
tree | 5e00678b77a887f604d71629c5876c5b58b19d5f /ext/webgpu/lib.rs | |
parent | 19c0633a947f2ee28cc07b59c32322151779101d (diff) |
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.
Diffstat (limited to 'ext/webgpu/lib.rs')
-rw-r--r-- | ext/webgpu/lib.rs | 8 |
1 files changed, 5 insertions, 3 deletions
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(), |