Deploying to master from @ gfx-rs/wgpu@3a5d0f2 🚀

Author: jimblandy

doc/search-index.js

@@ -1241,7 +1241,32 @@
 <a href="#1240" id="1240">1240</a>
 <a href="#1241" id="1241">1241</a>
 <a href="#1242" id="1242">1242</a>
-<a href="#1243" id="1243">1243</a></pre></div><pre class="rust"><code><span class="kw">mod </span>allocator;
+<a href="#1243" id="1243">1243</a>
+<a href="#1244" id="1244">1244</a>
+<a href="#1245" id="1245">1245</a>
+<a href="#1246" id="1246">1246</a>
+<a href="#1247" id="1247">1247</a>
+<a href="#1248" id="1248">1248</a>
+<a href="#1249" id="1249">1249</a>
+<a href="#1250" id="1250">1250</a>
+<a href="#1251" id="1251">1251</a>
+<a href="#1252" id="1252">1252</a>
+<a href="#1253" id="1253">1253</a>
+<a href="#1254" id="1254">1254</a>
+<a href="#1255" id="1255">1255</a>
+<a href="#1256" id="1256">1256</a>
+<a href="#1257" id="1257">1257</a>
+<a href="#1258" id="1258">1258</a>
+<a href="#1259" id="1259">1259</a>
+<a href="#1260" id="1260">1260</a>
+<a href="#1261" id="1261">1261</a>
+<a href="#1262" id="1262">1262</a>
+<a href="#1263" id="1263">1263</a>
+<a href="#1264" id="1264">1264</a>
+<a href="#1265" id="1265">1265</a>
+<a href="#1266" id="1266">1266</a>
+<a href="#1267" id="1267">1267</a>
+<a href="#1268" id="1268">1268</a></pre></div><pre class="rust"><code><span class="kw">mod </span>allocator;
 <span class="kw">mod </span>bind;
 <span class="kw">mod </span>bundle;
 <span class="kw">mod </span>clear;
@@ -1280,7 +1305,7 @@
 <span class="kw">use </span><span class="kw">crate</span>::snatch::SnatchGuard;
 
 <span class="kw">use </span><span class="kw">crate</span>::init_tracker::BufferInitTrackerAction;
-<span class="kw">use </span><span class="kw">crate</span>::ray_tracing::AsAction;
+<span class="kw">use </span><span class="kw">crate</span>::ray_tracing::{AsAction, BuildAccelerationStructureError};
 <span class="kw">use </span><span class="kw">crate</span>::resource::{
     DestroyedResourceError, Fallible, InvalidResourceError, Labeled, ParentDevice <span class="kw">as _</span>, QuerySet,
 };
@@ -1349,17 +1374,6 @@
 }
 
 <span class="kw">impl </span>CommandEncoderStatus {
-    <span class="doccomment">/// Checks that the encoder is in the [`Self::Recording`] state.
-    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>record(<span class="kw-2">&amp;mut </span><span class="self">self</span>) -&gt; <span class="prelude-ty">Result</span>&lt;RecordingGuard&lt;<span class="lifetime">'_</span>&gt;, EncoderStateError&gt; {
-        <span class="kw">match </span><span class="self">self </span>{
-            <span class="self">Self</span>::Recording(<span class="kw">_</span>) =&gt; <span class="prelude-val">Ok</span>(RecordingGuard { inner: <span class="self">self </span>}),
-            <span class="self">Self</span>::Locked(<span class="kw">_</span>) =&gt; <span class="prelude-val">Err</span>(<span class="self">self</span>.invalidate(EncoderStateError::Locked)),
-            <span class="self">Self</span>::Finished(<span class="kw">_</span>) =&gt; <span class="prelude-val">Err</span>(EncoderStateError::Ended),
-            <span class="self">Self</span>::Error(<span class="kw">_</span>) =&gt; <span class="prelude-val">Err</span>(EncoderStateError::Invalid),
-            <span class="self">Self</span>::Transitioning =&gt; <span class="macro">unreachable!</span>(),
-        }
-    }
-
     <span class="doccomment">/// Record commands using the supplied closure.
     ///
     /// If the encoder is in the [`Self::Recording`] state, calls the closure to
@@ -1381,29 +1395,50 @@
         <span class="kw-2">&amp;mut </span><span class="self">self</span>,
         f: F,
     ) -&gt; <span class="prelude-ty">Result</span>&lt;(), EncoderStateError&gt; {
-        <span class="kw">let </span>err = <span class="kw">match </span><span class="self">self</span>.record() {
-            <span class="prelude-val">Ok</span>(guard) =&gt; {
-                guard.record(f);
-                <span class="kw">return </span><span class="prelude-val">Ok</span>(());
+        <span class="kw">match </span><span class="self">self </span>{
+            <span class="self">Self</span>::Recording(<span class="kw">_</span>) =&gt; {
+                RecordingGuard { inner: <span class="self">self </span>}.record(f);
+                <span class="prelude-val">Ok</span>(())
             }
-            <span class="prelude-val">Err</span>(err) =&gt; err,
-        };
-        <span class="kw">match </span>err {
-            err @ EncoderStateError::Locked =&gt; {
+            <span class="self">Self</span>::Locked(<span class="kw">_</span>) =&gt; {
                 <span class="comment">// Invalidate the encoder and do not record anything, but do not
                 // return an immediate validation error.
-                </span><span class="self">self</span>.invalidate(err);
+                </span><span class="self">self</span>.invalidate(EncoderStateError::Locked);
                 <span class="prelude-val">Ok</span>(())
             }
-            err @ EncoderStateError::Ended =&gt; {
-                <span class="comment">// Invalidate the encoder, do not record anything, and return an
-                // immediate validation error.
-                </span><span class="prelude-val">Err</span>(<span class="self">self</span>.invalidate(err))
-            }
+            <span class="comment">// Encoder is ended. Invalidate the encoder, do not record anything,
+            // and return an immediate validation error.
+            </span><span class="self">Self</span>::Finished(<span class="kw">_</span>) =&gt; <span class="prelude-val">Err</span>(<span class="self">self</span>.invalidate(EncoderStateError::Ended)),
             <span class="comment">// Encoder is already invalid. Do not record anything, but do not
             // return an immediate validation error.
-            </span>EncoderStateError::Invalid =&gt; <span class="prelude-val">Ok</span>(()),
-            EncoderStateError::Unlocked | EncoderStateError::Submitted =&gt; <span class="macro">unreachable!</span>(),
+            </span><span class="self">Self</span>::Error(<span class="kw">_</span>) =&gt; <span class="prelude-val">Ok</span>(()),
+            <span class="self">Self</span>::Transitioning =&gt; <span class="macro">unreachable!</span>(),
+        }
+    }
+
+    <span class="doccomment">/// Special version of record used by `command_encoder_as_hal_mut`. This
+    /// differs from the regular version in two ways:
+    ///
+    /// 1. The recording closure is infallible.
+    /// 2. The recording closure takes `Option&lt;&amp;mut CommandBufferMutable&gt;`, and
+    ///    in the case that the encoder is not in a valid state for recording, the
+    ///    closure is still called, with `None` as its argument.
+    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>record_as_hal_mut&lt;T, F: FnOnce(<span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;mut </span>CommandBufferMutable&gt;) -&gt; T&gt;(
+        <span class="kw-2">&amp;mut </span><span class="self">self</span>,
+        f: F,
+    ) -&gt; T {
+        <span class="kw">match </span><span class="self">self </span>{
+            <span class="self">Self</span>::Recording(<span class="kw">_</span>) =&gt; RecordingGuard { inner: <span class="self">self </span>}.record_as_hal_mut(f),
+            <span class="self">Self</span>::Locked(<span class="kw">_</span>) =&gt; {
+                <span class="self">self</span>.invalidate(EncoderStateError::Locked);
+                f(<span class="prelude-val">None</span>)
+            }
+            <span class="self">Self</span>::Finished(<span class="kw">_</span>) =&gt; {
+                <span class="self">self</span>.invalidate(EncoderStateError::Ended);
+                f(<span class="prelude-val">None</span>)
+            }
+            <span class="self">Self</span>::Error(<span class="kw">_</span>) =&gt; f(<span class="prelude-val">None</span>),
+            <span class="self">Self</span>::Transitioning =&gt; <span class="macro">unreachable!</span>(),
         }
     }
 
@@ -1538,6 +1573,17 @@
             }
         }
     }
+
+    <span class="doccomment">/// Special version of record used by `command_encoder_as_hal_mut`. This
+    /// version takes an infallible recording closure.
+    </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>record_as_hal_mut&lt;T, F: FnOnce(<span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;mut </span>CommandBufferMutable&gt;) -&gt; T&gt;(
+        <span class="kw-2">mut </span><span class="self">self</span>,
+        f: F,
+    ) -&gt; T {
+        <span class="kw">let </span>res = f(<span class="prelude-val">Some</span>(<span class="kw-2">&amp;mut </span><span class="self">self</span>));
+        <span class="self">self</span>.mark_successful();
+        res
+    }
 }
 
 <span class="kw">impl</span>&lt;<span class="lifetime">'a</span>&gt; Drop <span class="kw">for </span>RecordingGuard&lt;<span class="lifetime">'a</span>&gt; {
@@ -2142,6 +2188,10 @@
     <span class="attr">#[error(transparent)]
     </span>Clear(<span class="attr">#[from] </span>ClearError),
     <span class="attr">#[error(transparent)]
+    </span>Query(<span class="attr">#[from] </span>QueryError),
+    <span class="attr">#[error(transparent)]
+    </span>BuildAccelerationStructure(<span class="attr">#[from] </span>BuildAccelerationStructureError),
+    <span class="attr">#[error(transparent)]
     </span>TransitionResources(<span class="attr">#[from] </span>TransitionResourcesError),
     <span class="attr">#[error(
         <span class="string">"begin and end indices of pass timestamp writes are both set to {idx}, which is not allowed"