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

Author: teoxoy

doc/search-index.js

@@ -3370,10 +3370,6 @@
 <a href="#3369" id="3369">3369</a>
 <a href="#3370" id="3370">3370</a>
 <a href="#3371" id="3371">3371</a>
-<a href="#3372" id="3372">3372</a>
-<a href="#3373" id="3373">3373</a>
-<a href="#3374" id="3374">3374</a>
-<a href="#3375" id="3375">3375</a>
 </pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
     context::downcast_ref, AdapterInfo, BindGroupDescriptor, BindGroupLayoutDescriptor,
     BindingResource, BufferBinding, BufferDescriptor, CommandEncoderDescriptor, CompilationInfo,
@@ -3400,7 +3396,7 @@
     sync::Arc,
 };
 <span class="kw">use </span>wgc::error::ContextErrorSource;
-<span class="kw">use </span>wgc::{command::bundle_ffi::<span class="kw-2">*</span>, device::DeviceLostClosure, pipeline::CreateShaderModuleError};
+<span class="kw">use </span>wgc::{command::bundle_ffi::<span class="kw-2">*</span>, pipeline::CreateShaderModuleError};
 <span class="kw">use </span>wgt::WasmNotSendSync;
 
 <span class="kw">pub struct </span>ContextWgpuCore(wgc::global::Global);
@@ -4728,9 +4724,8 @@
         device_data: <span class="kw-2">&amp;</span><span class="self">Self</span>::DeviceData,
         device_lost_callback: <span class="kw">crate</span>::context::DeviceLostCallback,
     ) {
-        <span class="kw">let </span>device_lost_closure = DeviceLostClosure::from_rust(device_lost_callback);
         <span class="self">self</span>.<span class="number">0
-            </span>.device_set_device_lost_closure(device_data.id, device_lost_closure);
+            </span>.device_set_device_lost_closure(device_data.id, device_lost_callback);
     }
     <span class="kw">fn </span>device_destroy(<span class="kw-2">&amp;</span><span class="self">self</span>, device_data: <span class="kw-2">&amp;</span><span class="self">Self</span>::DeviceData) {
         <span class="self">self</span>.<span class="number">0</span>.device_destroy(device_data.id);
@@ -4782,12 +4777,10 @@
                 MapMode::Read =&gt; wgc::device::HostMap::Read,
                 MapMode::Write =&gt; wgc::device::HostMap::Write,
             },
-            callback: <span class="prelude-val">Some</span>(wgc::resource::BufferMapCallback::from_rust(Box::new(
-                |status| {
-                    <span class="kw">let </span>res = status.map_err(|<span class="kw">_</span>| <span class="kw">crate</span>::BufferAsyncError);
-                    callback(res);
-                },
-            ))),
+            callback: <span class="prelude-val">Some</span>(Box::new(|status| {
+                <span class="kw">let </span>res = status.map_err(|<span class="kw">_</span>| <span class="kw">crate</span>::BufferAsyncError);
+                callback(res);
+            })),
         };
 
         <span class="kw">match </span><span class="self">self</span>.<span class="number">0</span>.buffer_map_async(
@@ -5481,8 +5474,7 @@
         queue_data: <span class="kw-2">&amp;</span><span class="self">Self</span>::QueueData,
         callback: <span class="kw">crate</span>::context::SubmittedWorkDoneCallback,
     ) {
-        <span class="kw">let </span>closure = wgc::device::queue::SubmittedWorkDoneClosure::from_rust(callback);
-        <span class="self">self</span>.<span class="number">0</span>.queue_on_submitted_work_done(queue_data.id, closure);
+        <span class="self">self</span>.<span class="number">0</span>.queue_on_submitted_work_done(queue_data.id, callback);
     }
 
     <span class="kw">fn </span>device_start_capture(<span class="kw-2">&amp;</span><span class="self">self</span>, device_data: <span class="kw-2">&amp;</span><span class="self">Self</span>::DeviceData) {

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

@@ -3693,9 +3693,9 @@
 <span class="attr">#[cfg(not(send_sync))]
 </span><span class="kw">pub type </span>SubmittedWorkDoneCallback = Box&lt;<span class="kw">dyn </span>FnOnce() + <span class="lifetime">'static</span>&gt;;
 <span class="attr">#[cfg(send_sync)]
-</span><span class="kw">pub type </span>DeviceLostCallback = Box&lt;<span class="kw">dyn </span>Fn(DeviceLostReason, String) + Send + <span class="lifetime">'static</span>&gt;;
+</span><span class="kw">pub type </span>DeviceLostCallback = Box&lt;<span class="kw">dyn </span>FnOnce(DeviceLostReason, String) + Send + <span class="lifetime">'static</span>&gt;;
 <span class="attr">#[cfg(not(send_sync))]
-</span><span class="kw">pub type </span>DeviceLostCallback = Box&lt;<span class="kw">dyn </span>Fn(DeviceLostReason, String) + <span class="lifetime">'static</span>&gt;;
+</span><span class="kw">pub type </span>DeviceLostCallback = Box&lt;<span class="kw">dyn </span>FnOnce(DeviceLostReason, String) + <span class="lifetime">'static</span>&gt;;
 
 <span class="doccomment">/// An object safe variant of [`Context`] implemented by all types that implement [`Context`].
 </span><span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">trait </span>DynContext: Debug + WasmNotSendSync {

doc/src/wgpu/context.rs.html

@@ -2277,18 +2277,6 @@
 <a href="#2276" id="2276">2276</a>
 <a href="#2277" id="2277">2277</a>
 <a href="#2278" id="2278">2278</a>
-<a href="#2279" id="2279">2279</a>
-<a href="#2280" id="2280">2280</a>
-<a href="#2281" id="2281">2281</a>
-<a href="#2282" id="2282">2282</a>
-<a href="#2283" id="2283">2283</a>
-<a href="#2284" id="2284">2284</a>
-<a href="#2285" id="2285">2285</a>
-<a href="#2286" id="2286">2286</a>
-<a href="#2287" id="2287">2287</a>
-<a href="#2288" id="2288">2288</a>
-<a href="#2289" id="2289">2289</a>
-<a href="#2290" id="2290">2290</a>
 </pre></div><pre class="rust"><code><span class="attr">#[cfg(feature = <span class="string">"trace"</span>)]
 </span><span class="kw">use </span><span class="kw">crate</span>::device::trace;
 <span class="kw">use crate</span>::{
@@ -2299,7 +2287,7 @@
     },
     command::{<span class="self">self</span>, CommandBuffer},
     conv,
-    device::{bgl, life::WaitIdleError, DeviceError, DeviceLostClosure, DeviceLostReason},
+    device::{bgl, life::WaitIdleError, DeviceError, DeviceLostClosure},
     global::Global,
     hal_api::HalApi,
     id::{<span class="self">self</span>, AdapterId, DeviceId, QueueId, SurfaceId},
@@ -4374,31 +4362,18 @@
         <span class="self">self</span>.hub.devices.remove(device_id);
     }
 
-    <span class="comment">// This closure will be called exactly once during "lose the device",
-    // or when it is replaced.
+    <span class="doccomment">/// `device_lost_closure` might never be called.
     </span><span class="kw">pub fn </span>device_set_device_lost_closure(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
         device_id: DeviceId,
         device_lost_closure: DeviceLostClosure,
     ) {
         <span class="kw">let </span>device = <span class="self">self</span>.hub.devices.get(device_id);
 
-        <span class="kw">let </span>old_device_lost_closure = device
+        device
             .device_lost_closure
             .lock()
             .replace(device_lost_closure);
-
-        <span class="kw">if let </span><span class="prelude-val">Some</span>(old_device_lost_closure) = old_device_lost_closure {
-            old_device_lost_closure.call(DeviceLostReason::ReplacedCallback, <span class="string">""</span>.to_string());
-        }
-    }
-
-    <span class="kw">pub fn </span>device_unregister_device_lost_closure(<span class="kw-2">&amp;</span><span class="self">self</span>, device_id: DeviceId) {
-        <span class="kw">let </span>device = <span class="self">self</span>.hub.devices.get(device_id);
-        <span class="kw">let </span>closure = device.device_lost_closure.lock().take();
-        <span class="kw">if let </span><span class="prelude-val">Some</span>(closure) = closure {
-            closure.call(DeviceLostReason::ReplacedCallback, <span class="string">""</span>.to_string());
-        }
     }
 
     <span class="kw">pub fn </span>device_destroy(<span class="kw-2">&amp;</span><span class="self">self</span>, device_id: DeviceId) {
@@ -4448,7 +4423,8 @@
         <span class="self">self</span>.hub.queues.remove(queue_id);
     }
 
-    <span class="kw">pub fn </span>buffer_map_async(
+    <span class="doccomment">/// `op.callback` is guaranteed to be called.
+    </span><span class="kw">pub fn </span>buffer_map_async(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
         buffer_id: id::BufferId,
         offset: BufferAddress,
@@ -4469,7 +4445,7 @@
             <span class="prelude-val">Ok</span>(submission_index) =&gt; <span class="prelude-val">Ok</span>(submission_index),
             <span class="prelude-val">Err</span>((<span class="kw-2">mut </span>operation, err)) =&gt; {
                 <span class="kw">if let </span><span class="prelude-val">Some</span>(callback) = operation.callback.take() {
-                    callback.call(<span class="prelude-val">Err</span>(err.clone()));
+                    callback(<span class="prelude-val">Err</span>(err.clone()));
                 }
                 <span class="macro">log::error!</span>(<span class="string">"Buffer::map_async error: {err}"</span>);
                 <span class="prelude-val">Err</span>(err)

doc/src/wgpu_core/device/global.rs.html

@@ -458,106 +458,6 @@
 <a href="#457" id="457">457</a>
 <a href="#458" id="458">458</a>
 <a href="#459" id="459">459</a>
-<a href="#460" id="460">460</a>
-<a href="#461" id="461">461</a>
-<a href="#462" id="462">462</a>
-<a href="#463" id="463">463</a>
-<a href="#464" id="464">464</a>
-<a href="#465" id="465">465</a>
-<a href="#466" id="466">466</a>
-<a href="#467" id="467">467</a>
-<a href="#468" id="468">468</a>
-<a href="#469" id="469">469</a>
-<a href="#470" id="470">470</a>
-<a href="#471" id="471">471</a>
-<a href="#472" id="472">472</a>
-<a href="#473" id="473">473</a>
-<a href="#474" id="474">474</a>
-<a href="#475" id="475">475</a>
-<a href="#476" id="476">476</a>
-<a href="#477" id="477">477</a>
-<a href="#478" id="478">478</a>
-<a href="#479" id="479">479</a>
-<a href="#480" id="480">480</a>
-<a href="#481" id="481">481</a>
-<a href="#482" id="482">482</a>
-<a href="#483" id="483">483</a>
-<a href="#484" id="484">484</a>
-<a href="#485" id="485">485</a>
-<a href="#486" id="486">486</a>
-<a href="#487" id="487">487</a>
-<a href="#488" id="488">488</a>
-<a href="#489" id="489">489</a>
-<a href="#490" id="490">490</a>
-<a href="#491" id="491">491</a>
-<a href="#492" id="492">492</a>
-<a href="#493" id="493">493</a>
-<a href="#494" id="494">494</a>
-<a href="#495" id="495">495</a>
-<a href="#496" id="496">496</a>
-<a href="#497" id="497">497</a>
-<a href="#498" id="498">498</a>
-<a href="#499" id="499">499</a>
-<a href="#500" id="500">500</a>
-<a href="#501" id="501">501</a>
-<a href="#502" id="502">502</a>
-<a href="#503" id="503">503</a>
-<a href="#504" id="504">504</a>
-<a href="#505" id="505">505</a>
-<a href="#506" id="506">506</a>
-<a href="#507" id="507">507</a>
-<a href="#508" id="508">508</a>
-<a href="#509" id="509">509</a>
-<a href="#510" id="510">510</a>
-<a href="#511" id="511">511</a>
-<a href="#512" id="512">512</a>
-<a href="#513" id="513">513</a>
-<a href="#514" id="514">514</a>
-<a href="#515" id="515">515</a>
-<a href="#516" id="516">516</a>
-<a href="#517" id="517">517</a>
-<a href="#518" id="518">518</a>
-<a href="#519" id="519">519</a>
-<a href="#520" id="520">520</a>
-<a href="#521" id="521">521</a>
-<a href="#522" id="522">522</a>
-<a href="#523" id="523">523</a>
-<a href="#524" id="524">524</a>
-<a href="#525" id="525">525</a>
-<a href="#526" id="526">526</a>
-<a href="#527" id="527">527</a>
-<a href="#528" id="528">528</a>
-<a href="#529" id="529">529</a>
-<a href="#530" id="530">530</a>
-<a href="#531" id="531">531</a>
-<a href="#532" id="532">532</a>
-<a href="#533" id="533">533</a>
-<a href="#534" id="534">534</a>
-<a href="#535" id="535">535</a>
-<a href="#536" id="536">536</a>
-<a href="#537" id="537">537</a>
-<a href="#538" id="538">538</a>
-<a href="#539" id="539">539</a>
-<a href="#540" id="540">540</a>
-<a href="#541" id="541">541</a>
-<a href="#542" id="542">542</a>
-<a href="#543" id="543">543</a>
-<a href="#544" id="544">544</a>
-<a href="#545" id="545">545</a>
-<a href="#546" id="546">546</a>
-<a href="#547" id="547">547</a>
-<a href="#548" id="548">548</a>
-<a href="#549" id="549">549</a>
-<a href="#550" id="550">550</a>
-<a href="#551" id="551">551</a>
-<a href="#552" id="552">552</a>
-<a href="#553" id="553">553</a>
-<a href="#554" id="554">554</a>
-<a href="#555" id="555">555</a>
-<a href="#556" id="556">556</a>
-<a href="#557" id="557">557</a>
-<a href="#558" id="558">558</a>
-<a href="#559" id="559">559</a>
 </pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
     binding_model,
     hub::Hub,
@@ -572,7 +472,6 @@
 
 <span class="kw">use </span>arrayvec::ArrayVec;
 <span class="kw">use </span>smallvec::SmallVec;
-<span class="kw">use </span>std::os::raw::c_char;
 <span class="kw">use </span>thiserror::Error;
 <span class="kw">use </span>wgt::{BufferAddress, DeviceLostReason, TextureFormat};
 
@@ -736,128 +635,29 @@
         // a on_submitted_work_done callback to be fired before the on_submitted_work_done callback.
         </span><span class="kw">for </span>(<span class="kw-2">mut </span>operation, status) <span class="kw">in </span><span class="self">self</span>.mappings {
             <span class="kw">if let </span><span class="prelude-val">Some</span>(callback) = operation.callback.take() {
-                callback.call(status);
+                callback(status);
             }
         }
         <span class="kw">for </span>closure <span class="kw">in </span><span class="self">self</span>.submissions {
-            closure.call();
+            closure();
         }
         <span class="kw">for </span>invocation <span class="kw">in </span><span class="self">self</span>.device_lost_invocations {
-            invocation
-                .closure
-                .call(invocation.reason, invocation.message);
+            (invocation.closure)(invocation.reason, invocation.message);
         }
     }
 }
 
 <span class="attr">#[cfg(send_sync)]
-</span><span class="kw">pub type </span>DeviceLostCallback = Box&lt;<span class="kw">dyn </span>Fn(DeviceLostReason, String) + Send + <span class="lifetime">'static</span>&gt;;
+</span><span class="kw">pub type </span>DeviceLostClosure = Box&lt;<span class="kw">dyn </span>FnOnce(DeviceLostReason, String) + Send + <span class="lifetime">'static</span>&gt;;
 <span class="attr">#[cfg(not(send_sync))]
-</span><span class="kw">pub type </span>DeviceLostCallback = Box&lt;<span class="kw">dyn </span>Fn(DeviceLostReason, String) + <span class="lifetime">'static</span>&gt;;
-
-<span class="kw">pub struct </span>DeviceLostClosureRust {
-    <span class="kw">pub </span>callback: DeviceLostCallback,
-    consumed: bool,
-}
-
-<span class="kw">impl </span>Drop <span class="kw">for </span>DeviceLostClosureRust {
-    <span class="kw">fn </span>drop(<span class="kw-2">&amp;mut </span><span class="self">self</span>) {
-        <span class="kw">if </span>!<span class="self">self</span>.consumed {
-            <span class="macro">panic!</span>(<span class="string">"DeviceLostClosureRust must be consumed before it is dropped."</span>);
-        }
-    }
-}
-
-<span class="attr">#[repr(C)]
-</span><span class="kw">pub struct </span>DeviceLostClosureC {
-    <span class="kw">pub </span>callback: <span class="kw">unsafe extern </span><span class="string">"C" </span><span class="kw">fn</span>(user_data: <span class="kw-2">*mut </span>u8, reason: u8, message: <span class="kw-2">*const </span>c_char),
-    <span class="kw">pub </span>user_data: <span class="kw-2">*mut </span>u8,
-    consumed: bool,
-}
-
-<span class="attr">#[cfg(send_sync)]
-</span><span class="kw">unsafe impl </span>Send <span class="kw">for </span>DeviceLostClosureC {}
-
-<span class="kw">impl </span>Drop <span class="kw">for </span>DeviceLostClosureC {
-    <span class="kw">fn </span>drop(<span class="kw-2">&amp;mut </span><span class="self">self</span>) {
-        <span class="kw">if </span>!<span class="self">self</span>.consumed {
-            <span class="macro">panic!</span>(<span class="string">"DeviceLostClosureC must be consumed before it is dropped."</span>);
-        }
-    }
-}
-
-<span class="kw">pub struct </span>DeviceLostClosure {
-    <span class="comment">// We wrap this so creating the enum in the C variant can be unsafe,
-    // allowing our call function to be safe.
-    </span>inner: DeviceLostClosureInner,
-}
+</span><span class="kw">pub type </span>DeviceLostClosure = Box&lt;<span class="kw">dyn </span>FnOnce(DeviceLostReason, String) + <span class="lifetime">'static</span>&gt;;
 
 <span class="kw">pub struct </span>DeviceLostInvocation {
     closure: DeviceLostClosure,
     reason: DeviceLostReason,
     message: String,
 }
 
-<span class="kw">enum </span>DeviceLostClosureInner {
-    Rust { inner: DeviceLostClosureRust },
-    C { inner: DeviceLostClosureC },
-}
-
-<span class="kw">impl </span>DeviceLostClosure {
-    <span class="kw">pub fn </span>from_rust(callback: DeviceLostCallback) -&gt; <span class="self">Self </span>{
-        <span class="kw">let </span>inner = DeviceLostClosureRust {
-            callback,
-            consumed: <span class="bool-val">false</span>,
-        };
-        <span class="self">Self </span>{
-            inner: DeviceLostClosureInner::Rust { inner },
-        }
-    }
-
-    <span class="doccomment">/// # Safety
-    ///
-    /// - The callback pointer must be valid to call with the provided `user_data`
-    ///   pointer.
-    ///
-    /// - Both pointers must point to `'static` data, as the callback may happen at
-    ///   an unspecified time.
-    </span><span class="kw">pub unsafe fn </span>from_c(<span class="kw-2">mut </span>closure: DeviceLostClosureC) -&gt; <span class="self">Self </span>{
-        <span class="comment">// Build an inner with the values from closure, ensuring that
-        // inner.consumed is false.
-        </span><span class="kw">let </span>inner = DeviceLostClosureC {
-            callback: closure.callback,
-            user_data: closure.user_data,
-            consumed: <span class="bool-val">false</span>,
-        };
-
-        <span class="comment">// Mark the original closure as consumed, so we can safely drop it.
-        </span>closure.consumed = <span class="bool-val">true</span>;
-
-        <span class="self">Self </span>{
-            inner: DeviceLostClosureInner::C { inner },
-        }
-    }
-
-    <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>call(<span class="self">self</span>, reason: DeviceLostReason, message: String) {
-        <span class="kw">match </span><span class="self">self</span>.inner {
-            DeviceLostClosureInner::Rust { <span class="kw-2">mut </span>inner } =&gt; {
-                inner.consumed = <span class="bool-val">true</span>;
-
-                (inner.callback)(reason, message)
-            }
-            <span class="comment">// SAFETY: the contract of the call to from_c says that this unsafe is sound.
-            </span>DeviceLostClosureInner::C { <span class="kw-2">mut </span>inner } =&gt; <span class="kw">unsafe </span>{
-                inner.consumed = <span class="bool-val">true</span>;
-
-                <span class="comment">// Ensure message is structured as a null-terminated C string. It only
-                // needs to live as long as the callback invocation.
-                </span><span class="kw">let </span>message = std::ffi::CString::new(message).unwrap();
-                (inner.callback)(inner.user_data, reason <span class="kw">as </span>u8, message.as_ptr())
-            },
-        }
-    }
-}
-
 <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>map_buffer(
     buffer: <span class="kw-2">&amp;</span>Buffer,
     offset: BufferAddress,