Deploying to master from @ gfx-rs/wgpu@ebdd958 🚀

Author: Wumpf

doc/search-index.js

@@ -385,6 +385,7 @@
 <a href="#384" id="384">384</a>
 <a href="#385" id="385">385</a>
 <a href="#386" id="386">386</a>
+<a href="#387" id="387">387</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>std::{error, fmt};
 
 <span class="kw">use </span>parking_lot::Mutex;
@@ -489,6 +490,7 @@
             SurfaceStatus::Timeout =&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(SurfaceError::Timeout),
             SurfaceStatus::Outdated =&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(SurfaceError::Outdated),
             SurfaceStatus::Lost =&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(SurfaceError::Lost),
+            SurfaceStatus::Unknown =&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(SurfaceError::Other),
         };
 
         <span class="kw">let </span>guard = <span class="self">self</span>.config.lock();

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

@@ -74,6 +74,9 @@
 <a href="#73" id="73">73</a>
 <a href="#74" id="74">74</a>
 <a href="#75" id="75">75</a>
+<a href="#76" id="76">76</a>
+<a href="#77" id="77">77</a>
+<a href="#78" id="78">78</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>std::{error, fmt, thread};
 
 <span class="kw">use crate</span>::<span class="kw-2">*</span>;
@@ -134,6 +137,8 @@
     </span>Lost,
     <span class="doccomment">/// There is no more memory left to allocate a new frame.
     </span>OutOfMemory,
+    <span class="doccomment">/// Acquiring a texture failed with a generic error. Check error callbacks for more information.
+    </span>Other,
 }
 <span class="macro">static_assertions::assert_impl_all!</span>(SurfaceError: Send, Sync);
 
@@ -144,6 +149,7 @@
             <span class="self">Self</span>::Outdated =&gt; <span class="string">"The underlying surface has changed, and therefore the swap chain must be updated"</span>,
             <span class="self">Self</span>::Lost =&gt;  <span class="string">"The swap chain has been lost and needs to be recreated"</span>,
             <span class="self">Self</span>::OutOfMemory =&gt; <span class="string">"There is no more memory left to allocate a new frame"</span>,
+            <span class="self">Self</span>::Other =&gt; <span class="string">"Acquiring a texture failed with a generic error. Check error callbacks for more information"</span>,
         })
     }
 }

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

@@ -3536,6 +3536,23 @@
 <a href="#3535" id="3535">3535</a>
 <a href="#3536" id="3536">3536</a>
 <a href="#3537" id="3537">3537</a>
+<a href="#3538" id="3538">3538</a>
+<a href="#3539" id="3539">3539</a>
+<a href="#3540" id="3540">3540</a>
+<a href="#3541" id="3541">3541</a>
+<a href="#3542" id="3542">3542</a>
+<a href="#3543" id="3543">3543</a>
+<a href="#3544" id="3544">3544</a>
+<a href="#3545" id="3545">3545</a>
+<a href="#3546" id="3546">3546</a>
+<a href="#3547" id="3547">3547</a>
+<a href="#3548" id="3548">3548</a>
+<a href="#3549" id="3549">3549</a>
+<a href="#3550" id="3550">3550</a>
+<a href="#3551" id="3551">3551</a>
+<a href="#3552" id="3552">3552</a>
+<a href="#3553" id="3553">3553</a>
+<a href="#3554" id="3554">3554</a>
 </pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
     api,
     dispatch::{<span class="self">self</span>, BufferMappedRangeInterface, InterfaceTypes},
@@ -3980,6 +3997,9 @@
     <span class="doccomment">/// Configured device is needed to know which backend
     /// code to execute when acquiring a new frame.
     </span>configured_device: Mutex&lt;<span class="prelude-ty">Option</span>&lt;wgc::id::DeviceId&gt;&gt;,
+    <span class="doccomment">/// The error sink with which to report errors.
+    /// `None` if the surface has not been configured.
+    </span>error_sink: Mutex&lt;<span class="prelude-ty">Option</span>&lt;ErrorSink&gt;&gt;,
 }
 
 <span class="attr">#[derive(Debug)]
@@ -4365,6 +4385,7 @@
             context: <span class="self">self</span>.clone(),
             id,
             configured_device: Mutex::default(),
+            error_sink: Mutex::default(),
         }))
     }
 
@@ -6973,9 +6994,11 @@
 
         <span class="kw">let </span>error = <span class="self">self</span>.context.<span class="number">0</span>.surface_configure(<span class="self">self</span>.id, device.id, config);
         <span class="kw">if let </span><span class="prelude-val">Some</span>(e) = error {
-            <span class="self">self</span>.context.handle_error_fatal(e, <span class="string">"Surface::configure"</span>);
+            <span class="self">self</span>.context
+                .handle_error_nolabel(<span class="kw-2">&amp;</span>device.error_sink, e, <span class="string">"Surface::configure"</span>);
         } <span class="kw">else </span>{
             <span class="kw-2">*</span><span class="self">self</span>.configured_device.lock() = <span class="prelude-val">Some</span>(device.id);
+            <span class="kw-2">*</span><span class="self">self</span>.error_sink.lock() = <span class="prelude-val">Some</span>(device.error_sink.clone());
         }
     }
 
@@ -6986,6 +7009,12 @@
         <span class="kw">crate</span>::SurfaceStatus,
         dispatch::DispatchSurfaceOutputDetail,
     ) {
+        <span class="kw">let </span>output_detail = CoreSurfaceOutputDetail {
+            context: <span class="self">self</span>.context.clone(),
+            surface_id: <span class="self">self</span>.id,
+        }
+        .into();
+
         <span class="kw">match </span><span class="self">self</span>.context.<span class="number">0</span>.surface_get_current_texture(<span class="self">self</span>.id, <span class="prelude-val">None</span>) {
             <span class="prelude-val">Ok</span>(wgc::present::SurfaceOutput { status, texture_id }) =&gt; {
                 <span class="kw">let </span>data = texture_id
@@ -6996,19 +7025,24 @@
                     })
                     .map(Into::into);
 
-                (
-                    data,
-                    status,
-                    CoreSurfaceOutputDetail {
-                        context: <span class="self">self</span>.context.clone(),
-                        surface_id: <span class="self">self</span>.id,
+                (data, status, output_detail)
+            }
+            <span class="prelude-val">Err</span>(err) =&gt; {
+                <span class="kw">let </span>error_sink = <span class="self">self</span>.error_sink.lock();
+                <span class="kw">match </span>error_sink.as_ref() {
+                    <span class="prelude-val">Some</span>(error_sink) =&gt; {
+                        <span class="self">self</span>.context.handle_error_nolabel(
+                            error_sink,
+                            err,
+                            <span class="string">"Surface::get_current_texture_view"</span>,
+                        );
+                        (<span class="prelude-val">None</span>, <span class="kw">crate</span>::SurfaceStatus::Unknown, output_detail)
                     }
-                    .into(),
-                )
+                    <span class="prelude-val">None </span>=&gt; <span class="self">self
+                        </span>.context
+                        .handle_error_fatal(err, <span class="string">"Surface::get_current_texture_view"</span>),
+                }
             }
-            <span class="prelude-val">Err</span>(err) =&gt; <span class="self">self
-                </span>.context
-                .handle_error_fatal(err, <span class="string">"Surface::get_current_texture_view"</span>),
         }
     }
 }

doc/src/wgpu/backend/wgpu_core.rs.html

@@ -638,6 +638,7 @@
 <a href="#637" id="637">637</a>
 <a href="#638" id="638">638</a>
 <a href="#639" id="639">639</a>
+<a href="#640" id="640">640</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>std::sync::Arc;
 
 <span class="kw">use </span>wgpu::{Instance, Surface};
@@ -866,6 +867,7 @@
                 <span class="comment">// If the surface is outdated, or was lost, reconfigure it.
                 </span>wgpu::SurfaceError::Outdated
                 | wgpu::SurfaceError::Lost
+                | wgpu::SurfaceError::Other
                 <span class="comment">// If OutOfMemory happens, reconfiguring may not help, but we might as well try
                 </span>| wgpu::SurfaceError::OutOfMemory,
             ) =&gt; {

doc/src/wgpu_examples/framework.rs.html

@@ -7795,6 +7795,8 @@
 <a href="#7794" id="7794">7794</a>
 <a href="#7795" id="7795">7795</a>
 <a href="#7796" id="7796">7796</a>
+<a href="#7797" id="7797">7797</a>
+<a href="#7798" id="7798">7798</a>
 </pre></div><pre class="rust"><code><span class="doccomment">//! This library describes the API surface of WebGPU that is agnostic of the backend.
 //! This API is used for targeting both Web and Native.
 
@@ -13439,6 +13441,8 @@
     </span>Outdated,
     <span class="doccomment">/// The surface under the swap chain is lost.
     </span>Lost,
+    <span class="doccomment">/// The surface status is not known since `get_current_texture` previously failed.
+    </span>Unknown,
 }
 
 <span class="doccomment">/// Nanosecond timestamp used by the presentation engine.