Deploying to master from @ gfx-rs/wgpu@03ff99e 🚀

Author: cwfitzgerald

doc/search-index.js

@@ -195,7 +195,14 @@
 <a href="#194" id="194">194</a>
 <a href="#195" id="195">195</a>
 <a href="#196" id="196">196</a>
-</pre></div><pre class="rust"><code><span class="kw">use </span>std::future::Future;
+<a href="#197" id="197">197</a>
+<a href="#198" id="198">198</a>
+<a href="#199" id="199">199</a>
+<a href="#200" id="200">200</a>
+<a href="#201" id="201">201</a>
+<a href="#202" id="202">202</a>
+<a href="#203" id="203">203</a>
+</pre></div><pre class="rust"><code><span class="kw">use </span>std::{future::Future, sync::Arc};
 
 <span class="kw">use crate</span>::<span class="kw-2">*</span>;
 
@@ -210,9 +217,9 @@
 /// Does not have to be kept alive.
 ///
 /// Corresponds to [WebGPU `GPUAdapter`](https://gpuweb.github.io/gpuweb/#gpu-adapter).
-</span><span class="attr">#[derive(Debug)]
+</span><span class="attr">#[derive(Debug, Clone)]
 </span><span class="kw">pub struct </span>Adapter {
-    <span class="kw">pub</span>(<span class="kw">crate</span>) inner: dispatch::DispatchAdapter,
+    <span class="kw">pub</span>(<span class="kw">crate</span>) inner: Arc&lt;dispatch::DispatchAdapter&gt;,
 }
 <span class="attr">#[cfg(send_sync)]
 </span><span class="macro">static_assertions::assert_impl_all!</span>(Adapter: Send, Sync);
@@ -262,9 +269,16 @@
     ) -&gt; <span class="kw">impl </span>Future&lt;Output = <span class="prelude-ty">Result</span>&lt;(Device, Queue), RequestDeviceError&gt;&gt; + WasmNotSend {
         <span class="kw">let </span>device = <span class="self">self</span>.inner.request_device(desc, trace_path);
         <span class="kw">async move </span>{
-            device
-                .<span class="kw">await
-                </span>.map(|(device, queue)| (Device { inner: device }, Queue { inner: queue }))
+            device.<span class="kw">await</span>.map(|(device, queue)| {
+                (
+                    Device {
+                        inner: Arc::new(device),
+                    },
+                    Queue {
+                        inner: Arc::new(queue),
+                    },
+                )
+            })
         }
     }
 
@@ -290,10 +304,10 @@
 
         <span class="prelude-val">Ok</span>((
             Device {
-                inner: device.into(),
+                inner: Arc::new(device.into()),
             },
             Queue {
-                inner: queue.into(),
+                inner: Arc::new(queue.into()),
             },
         ))
     }

doc/src/wgpu/api/adapter.rs.html

@@ -141,7 +141,11 @@
 <a href="#140" id="140">140</a>
 <a href="#141" id="141">141</a>
 <a href="#142" id="142">142</a>
-</pre></div><pre class="rust"><code><span class="kw">use crate</span>::<span class="kw-2">*</span>;
+<a href="#143" id="143">143</a>
+<a href="#144" id="144">144</a>
+</pre></div><pre class="rust"><code><span class="kw">use </span>std::sync::Arc;
+
+<span class="kw">use crate</span>::<span class="kw-2">*</span>;
 
 <span class="doccomment">/// Handle to a binding group.
 ///
@@ -151,9 +155,9 @@
 /// [`ComputePass`] with [`ComputePass::set_bind_group`].
 ///
 /// Corresponds to [WebGPU `GPUBindGroup`](https://gpuweb.github.io/gpuweb/#gpubindgroup).
-</span><span class="attr">#[derive(Debug)]
+</span><span class="attr">#[derive(Debug, Clone)]
 </span><span class="kw">pub struct </span>BindGroup {
-    <span class="kw">pub</span>(<span class="kw">crate</span>) inner: dispatch::DispatchBindGroup,
+    <span class="kw">pub</span>(<span class="kw">crate</span>) inner: Arc&lt;dispatch::DispatchBindGroup&gt;,
 }
 <span class="attr">#[cfg(send_sync)]
 </span><span class="macro">static_assertions::assert_impl_all!</span>(BindGroup: Send, Sync);

doc/src/wgpu/api/bind_group.rs.html

@@ -36,7 +36,11 @@
 <a href="#35" id="35">35</a>
 <a href="#36" id="36">36</a>
 <a href="#37" id="37">37</a>
-</pre></div><pre class="rust"><code><span class="kw">use crate</span>::<span class="kw-2">*</span>;
+<a href="#38" id="38">38</a>
+<a href="#39" id="39">39</a>
+</pre></div><pre class="rust"><code><span class="kw">use </span>std::sync::Arc;
+
+<span class="kw">use crate</span>::<span class="kw-2">*</span>;
 
 <span class="doccomment">/// Handle to a binding group layout.
 ///
@@ -49,9 +53,9 @@
 ///
 /// Corresponds to [WebGPU `GPUBindGroupLayout`](
 /// https://gpuweb.github.io/gpuweb/#gpubindgrouplayout).
-</span><span class="attr">#[derive(Debug)]
+</span><span class="attr">#[derive(Debug, Clone)]
 </span><span class="kw">pub struct </span>BindGroupLayout {
-    <span class="kw">pub</span>(<span class="kw">crate</span>) inner: dispatch::DispatchBindGroupLayout,
+    <span class="kw">pub</span>(<span class="kw">crate</span>) inner: Arc&lt;dispatch::DispatchBindGroupLayout&gt;,
 }
 <span class="attr">#[cfg(send_sync)]
 </span><span class="macro">static_assertions::assert_impl_all!</span>(BindGroupLayout: Send, Sync);

doc/src/wgpu/api/bind_group_layout.rs.html

@@ -181,12 +181,6 @@
 <a href="#180" id="180">180</a>
 <a href="#181" id="181">181</a>
 <a href="#182" id="182">182</a>
-<a href="#183" id="183">183</a>
-<a href="#184" id="184">184</a>
-<a href="#185" id="185">185</a>
-<a href="#186" id="186">186</a>
-<a href="#187" id="187">187</a>
-<a href="#188" id="188">188</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">crate</span>::dispatch;
 <span class="kw">use crate</span>::{Buffer, Label};
 <span class="kw">use </span>std::sync::Arc;
@@ -233,7 +227,7 @@
 /// [TlasPackage]: crate::TlasPackage
 </span><span class="attr">#[derive(Debug, Clone)]
 </span><span class="kw">pub struct </span>TlasInstance {
-    <span class="kw">pub</span>(<span class="kw">crate</span>) blas: Arc&lt;BlasShared&gt;,
+    <span class="kw">pub</span>(<span class="kw">crate</span>) blas: Arc&lt;dispatch::DispatchBlas&gt;,
     <span class="doccomment">/// Affine transform matrix 3x4 (rows x columns, row major order).
     </span><span class="kw">pub </span>transform: [f32; <span class="number">12</span>],
     <span class="doccomment">/// Custom index for the instance used inside the shader.
@@ -260,7 +254,7 @@
     /// generate a validation error.
     </span><span class="kw">pub fn </span>new(blas: <span class="kw-2">&amp;</span>Blas, transform: [f32; <span class="number">12</span>], custom_index: u32, mask: u8) -&gt; <span class="self">Self </span>{
         <span class="self">Self </span>{
-            blas: blas.shared.clone(),
+            blas: blas.inner.clone(),
             transform,
             custom_index,
             mask,
@@ -272,7 +266,7 @@
     /// See the note on [TlasInstance] about the
     /// guarantees of keeping a BLAS alive.
     </span><span class="kw">pub fn </span>set_blas(<span class="kw-2">&amp;mut </span><span class="self">self</span>, blas: <span class="kw-2">&amp;</span>Blas) {
-        <span class="self">self</span>.blas = blas.shared.clone();
+        <span class="self">self</span>.blas = blas.inner.clone();
     }
 }
 
@@ -317,13 +311,7 @@
 }
 <span class="macro">static_assertions::assert_impl_all!</span>(BlasBuildEntry&lt;<span class="lifetime">'_</span>&gt;: WasmNotSendSync);
 
-<span class="attr">#[derive(Debug)]
-</span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">struct </span>BlasShared {
-    <span class="kw">pub</span>(<span class="kw">crate</span>) inner: dispatch::DispatchBlas,
-}
-<span class="macro">static_assertions::assert_impl_all!</span>(BlasShared: WasmNotSendSync);
-
-<span class="attr">#[derive(Debug)]
+<span class="attr">#[derive(Debug, Clone)]
 </span><span class="doccomment">/// Bottom Level Acceleration Structure (BLAS).
 ///
 /// A BLAS is a device-specific raytracing acceleration structure that contains geometry data.
@@ -333,11 +321,11 @@
 /// [Tlas]: crate::Tlas
 </span><span class="kw">pub struct </span>Blas {
     <span class="kw">pub</span>(<span class="kw">crate</span>) handle: <span class="prelude-ty">Option</span>&lt;u64&gt;,
-    <span class="kw">pub</span>(<span class="kw">crate</span>) shared: Arc&lt;BlasShared&gt;,
+    <span class="kw">pub</span>(<span class="kw">crate</span>) inner: Arc&lt;dispatch::DispatchBlas&gt;,
 }
 <span class="macro">static_assertions::assert_impl_all!</span>(Blas: WasmNotSendSync);
 
-<span class="macro">crate::cmp::impl_eq_ord_hash_proxy!</span>(Blas =&gt; .shared.inner);
+<span class="macro">crate::cmp::impl_eq_ord_hash_proxy!</span>(Blas =&gt; .inner);
 
 <span class="kw">impl </span>Blas {
     <span class="doccomment">/// Raw handle to the acceleration structure, used inside raw instance buffers.
@@ -346,7 +334,7 @@
     }
     <span class="doccomment">/// Destroy the associated native resources as soon as possible.
     </span><span class="kw">pub fn </span>destroy(<span class="kw-2">&amp;</span><span class="self">self</span>) {
-        <span class="self">self</span>.shared.inner.destroy();
+        <span class="self">self</span>.inner.destroy();
     }
 }