Deploying to master from @ gfx-rs/wgpu@7e11996 🚀

Author: cwfitzgerald

doc/search-index.js

@@ -683,7 +683,7 @@
 <span class="macro">static_assertions::assert_impl_all!</span>(DeviceDescriptor&lt;<span class="lifetime">'_</span>&gt;: Send, Sync);
 
 <span class="kw">impl </span>Device {
-    <span class="doccomment">/// Check for resource cleanups and mapping callbacks. Will block if [`Maintain::Wait`] is passed.
+    <span class="doccomment">/// Check for resource cleanups and mapping callbacks. Will block if [`PollType::Wait`] is passed.
     ///
     /// Return `true` if the queue is empty, or `false` if there are more queue
     /// submissions still in flight. (Note that, unless access to the [`Queue`] is
@@ -692,8 +692,8 @@
     /// other threads could submit new work at any time.)
     ///
     /// When running on WebGPU, this is a no-op. `Device`s are automatically polled.
-    </span><span class="kw">pub fn </span>poll(<span class="kw-2">&amp;</span><span class="self">self</span>, maintain: Maintain) -&gt; MaintainResult {
-        <span class="self">self</span>.inner.poll(maintain)
+    </span><span class="kw">pub fn </span>poll(<span class="kw-2">&amp;</span><span class="self">self</span>, poll_type: PollType) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw">crate</span>::PollStatus, <span class="kw">crate</span>::PollError&gt; {
+        <span class="self">self</span>.inner.poll(poll_type)
     }
 
     <span class="doccomment">/// The features which can be used on this device.

doc/search.desc/wgpu/wgpu-desc-0-.js

@@ -293,11 +293,11 @@
 <span class="attr">#[cfg(send_sync)]
 </span><span class="macro">static_assertions::assert_impl_all!</span>(SubmissionIndex: Send, Sync);
 
-<span class="kw">pub use </span>wgt::Maintain <span class="kw">as </span>MaintainBase;
+<span class="kw">pub use </span>wgt::PollType <span class="kw">as </span>MaintainBase;
 <span class="doccomment">/// Passed to [`Device::poll`] to control how and if it should block.
-</span><span class="kw">pub type </span>Maintain = wgt::Maintain&lt;SubmissionIndex&gt;;
+</span><span class="kw">pub type </span>PollType = wgt::PollType&lt;SubmissionIndex&gt;;
 <span class="attr">#[cfg(send_sync)]
-</span><span class="macro">static_assertions::assert_impl_all!</span>(Maintain: Send, Sync);
+</span><span class="macro">static_assertions::assert_impl_all!</span>(PollType: Send, Sync);
 
 <span class="doccomment">/// A write-only view into a staging buffer.
 ///

doc/search.desc/wgpu/wgpu-desc-1-.js

@@ -387,7 +387,14 @@
 <a href="#386" id="386">386</a>
 <a href="#387" id="387">387</a>
 <a href="#388" id="388">388</a>
-<a href="#389" id="389">389</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{error, fmt};
+<a href="#389" id="389">389</a>
+<a href="#390" id="390">390</a>
+<a href="#391" id="391">391</a>
+<a href="#392" id="392">392</a>
+<a href="#393" id="393">393</a>
+<a href="#394" id="394">394</a>
+<a href="#395" id="395">395</a>
+<a href="#396" id="396">396</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{error, fmt};
 
 <span class="kw">use </span>parking_lot::Mutex;
 <span class="kw">use </span>raw_window_handle::{HasDisplayHandle, HasWindowHandle};
@@ -464,6 +471,13 @@
 
     <span class="doccomment">/// Initializes [`Surface`] for presentation.
     ///
+    /// If the surface is already configured, this will wait for the GPU to come idle
+    /// before recreating the swapchain to prevent race conditions.
+    ///
+    /// # Validation Errors
+    /// - Submissions that happen _during_ the configure may cause the
+    ///   internal wait-for-idle to fail, raising a validation error.
+    ///
     /// # Panics
     ///
     /// - A old [`SurfaceTexture`] is still alive referencing an old surface.

doc/search.desc/wgpu_core/wgpu_core-desc-0-.js

@@ -3607,7 +3607,10 @@
 <a href="#3606" id="3606">3606</a>
 <a href="#3607" id="3607">3607</a>
 <a href="#3608" id="3608">3608</a>
-<a href="#3609" id="3609">3609</a></pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
+<a href="#3609" id="3609">3609</a>
+<a href="#3610" id="3610">3610</a>
+<a href="#3611" id="3611">3611</a>
+<a href="#3612" id="3612">3612</a></pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
     api,
     dispatch::{<span class="self">self</span>, BufferMappedRangeInterface, InterfaceTypes},
     BindingResource, BufferBinding, BufferDescriptor, CompilationInfo, CompilationMessage,
@@ -5254,14 +5257,17 @@
         <span class="self">self</span>.context.<span class="number">0</span>.device_stop_capture(<span class="self">self</span>.id);
     }
 
-    <span class="kw">fn </span>poll(<span class="kw-2">&amp;</span><span class="self">self</span>, maintain: <span class="kw">crate</span>::Maintain) -&gt; <span class="kw">crate</span>::MaintainResult {
-        <span class="kw">let </span>maintain_inner = maintain.map_index(|i| i.index);
+    <span class="kw">fn </span>poll(<span class="kw-2">&amp;</span><span class="self">self</span>, poll_type: <span class="kw">crate</span>::PollType) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw">crate</span>::PollStatus, <span class="kw">crate</span>::PollError&gt; {
+        <span class="kw">let </span>maintain_inner = poll_type.map_index(|i| i.index);
         <span class="kw">match </span><span class="self">self</span>.context.<span class="number">0</span>.device_poll(<span class="self">self</span>.id, maintain_inner) {
-            <span class="prelude-val">Ok</span>(done) =&gt; <span class="kw">match </span>done {
-                <span class="bool-val">true </span>=&gt; wgt::MaintainResult::SubmissionQueueEmpty,
-                <span class="bool-val">false </span>=&gt; wgt::MaintainResult::Ok,
-            },
-            <span class="prelude-val">Err</span>(err) =&gt; <span class="self">self</span>.context.handle_error_fatal(err, <span class="string">"Device::poll"</span>),
+            <span class="prelude-val">Ok</span>(status) =&gt; <span class="prelude-val">Ok</span>(status),
+            <span class="prelude-val">Err</span>(err) =&gt; {
+                <span class="kw">if let </span><span class="prelude-val">Some</span>(poll_error) = err.to_poll_error() {
+                    <span class="kw">return </span><span class="prelude-val">Err</span>(poll_error);
+                }
+
+                <span class="self">self</span>.context.handle_error_fatal(err, <span class="string">"Device::poll"</span>)
+            }
         }
     }
 

doc/search.desc/wgpu_types/wgpu_types-desc-0-.js

@@ -1041,7 +1041,7 @@
     <span class="kw">fn </span>start_capture(<span class="kw-2">&amp;</span><span class="self">self</span>);
     <span class="kw">fn </span>stop_capture(<span class="kw-2">&amp;</span><span class="self">self</span>);
 
-    <span class="kw">fn </span>poll(<span class="kw-2">&amp;</span><span class="self">self</span>, maintain: <span class="kw">crate</span>::Maintain) -&gt; <span class="kw">crate</span>::MaintainResult;
+    <span class="kw">fn </span>poll(<span class="kw-2">&amp;</span><span class="self">self</span>, poll_type: <span class="kw">crate</span>::PollType) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw">crate</span>::PollStatus, <span class="kw">crate</span>::PollError&gt;;
 
     <span class="kw">fn </span>get_internal_counters(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="kw">crate</span>::InternalCounters;
     <span class="kw">fn </span>generate_allocator_report(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="prelude-ty">Option</span>&lt;wgt::AllocatorReport&gt;;