[wgpu] Move Arcs to dispatch (#6850)

Author: sagudev

wgpu/src/api/adapter.rs

@@ -1,4 +1,4 @@
-use std::{future::Future, sync::Arc};
+use std::future::Future;
 
 use crate::*;
 
@@ -15,7 +15,7 @@ use crate::*;
 /// Corresponds to [WebGPU `GPUAdapter`](https://gpuweb.github.io/gpuweb/#gpu-adapter).
 #[derive(Debug, Clone)]
 pub struct Adapter {
-    pub(crate) inner: Arc<dispatch::DispatchAdapter>,
+    pub(crate) inner: dispatch::DispatchAdapter,
 }
 #[cfg(send_sync)]
 static_assertions::assert_impl_all!(Adapter: Send, Sync);
@@ -65,16 +65,9 @@ impl Adapter {
     ) -> impl Future<Output = Result<(Device, Queue), RequestDeviceError>> + WasmNotSend {
         let device = self.inner.request_device(desc, trace_path);
         async move {
-            device.await.map(|(device, queue)| {
-                (
-                    Device {
-                        inner: Arc::new(device),
-                    },
-                    Queue {
-                        inner: Arc::new(queue),
-                    },
-                )
-            })
+            device
+                .await
+                .map(|(device, queue)| (Device { inner: device }, Queue { inner: queue }))
         }
     }
 
@@ -100,10 +93,10 @@ impl Adapter {
 
         Ok((
             Device {
-                inner: Arc::new(device.into()),
+                inner: device.into(),
             },
             Queue {
-                inner: Arc::new(queue.into()),
+                inner: queue.into(),
             },
         ))
     }

wgpu/src/api/bind_group.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use crate::*;
 
 /// Handle to a binding group.
@@ -12,7 +10,7 @@ use crate::*;
 /// Corresponds to [WebGPU `GPUBindGroup`](https://gpuweb.github.io/gpuweb/#gpubindgroup).
 #[derive(Debug, Clone)]
 pub struct BindGroup {
-    pub(crate) inner: Arc<dispatch::DispatchBindGroup>,
+    pub(crate) inner: dispatch::DispatchBindGroup,
 }
 #[cfg(send_sync)]
 static_assertions::assert_impl_all!(BindGroup: Send, Sync);

wgpu/src/api/bind_group_layout.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use crate::*;
 
 /// Handle to a binding group layout.
@@ -15,7 +13,7 @@ use crate::*;
 /// https://gpuweb.github.io/gpuweb/#gpubindgrouplayout).
 #[derive(Debug, Clone)]
 pub struct BindGroupLayout {
-    pub(crate) inner: Arc<dispatch::DispatchBindGroupLayout>,
+    pub(crate) inner: dispatch::DispatchBindGroupLayout,
 }
 #[cfg(send_sync)]
 static_assertions::assert_impl_all!(BindGroupLayout: Send, Sync);

wgpu/src/api/blas.rs

@@ -1,6 +1,5 @@
 use crate::dispatch;
 use crate::{Buffer, Label};
-use std::sync::Arc;
 use wgt::WasmNotSendSync;
 
 /// Descriptor for the size defining attributes of a triangle geometry, for a bottom level acceleration structure.
@@ -44,7 +43,7 @@ static_assertions::assert_impl_all!(CreateBlasDescriptor<'_>: Send, Sync);
 /// [TlasPackage]: crate::TlasPackage
 #[derive(Debug, Clone)]
 pub struct TlasInstance {
-    pub(crate) blas: Arc<dispatch::DispatchBlas>,
+    pub(crate) blas: dispatch::DispatchBlas,
     /// Affine transform matrix 3x4 (rows x columns, row major order).
     pub transform: [f32; 12],
     /// Custom index for the instance used inside the shader.
@@ -138,7 +137,7 @@ static_assertions::assert_impl_all!(BlasBuildEntry<'_>: WasmNotSendSync);
 /// [Tlas]: crate::Tlas
 pub struct Blas {
     pub(crate) handle: Option<u64>,
-    pub(crate) inner: Arc<dispatch::DispatchBlas>,
+    pub(crate) inner: dispatch::DispatchBlas,
 }
 static_assertions::assert_impl_all!(Blas: WasmNotSendSync);
 

wgpu/src/api/buffer.rs

@@ -8,15 +8,6 @@ use parking_lot::Mutex;
 
 use crate::*;
 
-#[derive(Debug)]
-pub(crate) struct BufferShared {
-    pub inner: dispatch::DispatchBuffer,
-    pub map_context: Mutex<MapContext>,
-    pub size: wgt::BufferAddress,
-    pub usage: BufferUsages,
-    // Todo: missing map_state https://www.w3.org/TR/webgpu/#dom-gpubuffer-mapstate
-}
-
 /// Handle to a GPU-accessible buffer.
 ///
 /// Created with [`Device::create_buffer`] or
@@ -179,12 +170,16 @@ pub(crate) struct BufferShared {
 /// [`MAP_WRITE`]: BufferUsages::MAP_WRITE
 #[derive(Debug, Clone)]
 pub struct Buffer {
-    pub(crate) shared: Arc<BufferShared>,
+    pub(crate) inner: dispatch::DispatchBuffer,
+    pub(crate) map_context: Arc<Mutex<MapContext>>,
+    pub(crate) size: wgt::BufferAddress,
+    pub(crate) usage: BufferUsages,
+    // Todo: missing map_state https://www.w3.org/TR/webgpu/#dom-gpubuffer-mapstate
 }
 #[cfg(send_sync)]
 static_assertions::assert_impl_all!(Buffer: Send, Sync);
 
-crate::cmp::impl_eq_ord_hash_proxy!(Buffer => .shared.inner);
+crate::cmp::impl_eq_ord_hash_proxy!(Buffer => .inner);
 
 impl Buffer {
     /// Return the binding view of the entire buffer.
@@ -212,7 +207,7 @@ impl Buffer {
         &self,
         hal_buffer_callback: F,
     ) -> R {
-        if let Some(buffer) = self.shared.inner.as_core_opt() {
+        if let Some(buffer) = self.inner.as_core_opt() {
             unsafe {
                 buffer
                     .context
@@ -239,7 +234,7 @@ impl Buffer {
     /// end of the buffer.
     pub fn slice<S: RangeBounds<BufferAddress>>(&self, bounds: S) -> BufferSlice<'_> {
         let (offset, size) = range_to_offset_size(bounds);
-        check_buffer_bounds(self.shared.size, offset, size);
+        check_buffer_bounds(self.size, offset, size);
         BufferSlice {
             buffer: self,
             offset,
@@ -249,27 +244,27 @@ impl Buffer {
 
     /// Flushes any pending write operations and unmaps the buffer from host memory.
     pub fn unmap(&self) {
-        self.shared.map_context.lock().reset();
-        self.shared.inner.unmap();
+        self.map_context.lock().reset();
+        self.inner.unmap();
     }
 
     /// Destroy the associated native resources as soon as possible.
     pub fn destroy(&self) {
-        self.shared.inner.destroy();
+        self.inner.destroy();
     }
 
     /// Returns the length of the buffer allocation in bytes.
     ///
     /// This is always equal to the `size` that was specified when creating the buffer.
     pub fn size(&self) -> BufferAddress {
-        self.shared.size
+        self.size
     }
 
     /// Returns the allowed usages for this `Buffer`.
     ///
     /// This is always equal to the `usage` that was specified when creating the buffer.
     pub fn usage(&self) -> BufferUsages {
-        self.shared.usage
+        self.usage
     }
 }
 
@@ -336,7 +331,7 @@ impl<'a> BufferSlice<'a> {
         mode: MapMode,
         callback: impl FnOnce(Result<(), BufferAsyncError>) + WasmNotSend + 'static,
     ) {
-        let mut mc = self.buffer.shared.map_context.lock();
+        let mut mc = self.buffer.map_context.lock();
         assert_eq!(mc.initial_range, 0..0, "Buffer is already mapped");
         let end = match self.size {
             Some(s) => self.offset + s.get(),
@@ -345,7 +340,6 @@ impl<'a> BufferSlice<'a> {
         mc.initial_range = self.offset..end;
 
         self.buffer
-            .shared
             .inner
             .map_async(mode, self.offset..end, Box::new(callback));
     }
@@ -365,13 +359,8 @@ impl<'a> BufferSlice<'a> {
     ///
     /// [mapped]: Buffer#mapping-buffers
     pub fn get_mapped_range(&self) -> BufferView<'a> {
-        let end = self
-            .buffer
-            .shared
-            .map_context
-            .lock()
-            .add(self.offset, self.size);
-        let range = self.buffer.shared.inner.get_mapped_range(self.offset..end);
+        let end = self.buffer.map_context.lock().add(self.offset, self.size);
+        let range = self.buffer.inner.get_mapped_range(self.offset..end);
         BufferView {
             slice: *self,
             inner: range,
@@ -388,15 +377,9 @@ impl<'a> BufferSlice<'a> {
     /// This is only available on WebGPU, on any other backends this will return `None`.
     #[cfg(webgpu)]
     pub fn get_mapped_range_as_array_buffer(&self) -> Option<js_sys::ArrayBuffer> {
-        let end = self
-            .buffer
-            .shared
-            .map_context
-            .lock()
-            .add(self.offset, self.size);
+        let end = self.buffer.map_context.lock().add(self.offset, self.size);
 
         self.buffer
-            .shared
             .inner
             .get_mapped_range_as_array_buffer(self.offset..end)
     }
@@ -416,17 +399,12 @@ impl<'a> BufferSlice<'a> {
     ///
     /// [mapped]: Buffer#mapping-buffers
     pub fn get_mapped_range_mut(&self) -> BufferViewMut<'a> {
-        let end = self
-            .buffer
-            .shared
-            .map_context
-            .lock()
-            .add(self.offset, self.size);
-        let range = self.buffer.shared.inner.get_mapped_range(self.offset..end);
+        let end = self.buffer.map_context.lock().add(self.offset, self.size);
+        let range = self.buffer.inner.get_mapped_range(self.offset..end);
         BufferViewMut {
             slice: *self,
             inner: range,
-            readable: self.buffer.shared.usage.contains(BufferUsages::MAP_READ),
+            readable: self.buffer.usage.contains(BufferUsages::MAP_READ),
         }
     }
 }
@@ -651,7 +629,6 @@ impl Drop for BufferView<'_> {
     fn drop(&mut self) {
         self.slice
             .buffer
-            .shared
             .map_context
             .lock()
             .remove(self.slice.offset, self.slice.size);
@@ -662,7 +639,6 @@ impl Drop for BufferViewMut<'_> {
     fn drop(&mut self) {
         self.slice
             .buffer
-            .shared
             .map_context
             .lock()
             .remove(self.slice.offset, self.slice.size);

wgpu/src/api/command_encoder.rs

@@ -122,9 +122,9 @@ impl CommandEncoder {
         copy_size: BufferAddress,
     ) {
         self.inner.copy_buffer_to_buffer(
-            &source.shared.inner,
+            &source.inner,
             source_offset,
-            &destination.shared.inner,
+            &destination.inner,
             destination_offset,
             copy_size,
         );
@@ -183,8 +183,7 @@ impl CommandEncoder {
     /// - `CLEAR_TEXTURE` extension not enabled
     /// - Range is out of bounds
     pub fn clear_texture(&mut self, texture: &Texture, subresource_range: &ImageSubresourceRange) {
-        self.inner
-            .clear_texture(&texture.shared.inner, subresource_range);
+        self.inner.clear_texture(&texture.inner, subresource_range);
     }
 
     /// Clears buffer to zero.
@@ -199,7 +198,7 @@ impl CommandEncoder {
         offset: BufferAddress,
         size: Option<BufferAddress>,
     ) {
-        self.inner.clear_buffer(&buffer.shared.inner, offset, size);
+        self.inner.clear_buffer(&buffer.inner, offset, size);
     }
 
     /// Inserts debug marker.
@@ -232,7 +231,7 @@ impl CommandEncoder {
             &query_set.inner,
             query_range.start,
             query_range.end - query_range.start,
-            &destination.shared.inner,
+            &destination.inner,
             destination_offset,
         );
     }

wgpu/src/api/compute_pass.rs

@@ -52,7 +52,7 @@ impl ComputePass<'_> {
         Option<&'a BindGroup>: From<BG>,
     {
         let bg: Option<&BindGroup> = bind_group.into();
-        let bg = bg.map(|bg| &*bg.inner);
+        let bg = bg.map(|bg| &bg.inner);
         self.inner.set_bind_group(index, bg, offsets);
     }
 
@@ -92,7 +92,7 @@ impl ComputePass<'_> {
         indirect_offset: BufferAddress,
     ) {
         self.inner
-            .dispatch_workgroups_indirect(&indirect_buffer.shared.inner, indirect_offset);
+            .dispatch_workgroups_indirect(&indirect_buffer.inner, indirect_offset);
     }
 }
 

wgpu/src/api/compute_pipeline.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use crate::*;
 
 /// Handle to a compute pipeline.
@@ -10,7 +8,7 @@ use crate::*;
 /// Corresponds to [WebGPU `GPUComputePipeline`](https://gpuweb.github.io/gpuweb/#compute-pipeline).
 #[derive(Debug, Clone)]
 pub struct ComputePipeline {
-    pub(crate) inner: Arc<dispatch::DispatchComputePipeline>,
+    pub(crate) inner: dispatch::DispatchComputePipeline,
 }
 #[cfg(send_sync)]
 static_assertions::assert_impl_all!(ComputePipeline: Send, Sync);
@@ -27,9 +25,7 @@ impl ComputePipeline {
     /// This method will raise a validation error if there is no bind group layout at `index`.
     pub fn get_bind_group_layout(&self, index: u32) -> BindGroupLayout {
         let bind_group = self.inner.get_bind_group_layout(index);
-        BindGroupLayout {
-            inner: Arc::new(bind_group),
-        }
+        BindGroupLayout { inner: bind_group }
     }
 }