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

Author: jimblandy

doc/player/trait.GlobalPlay.html

@@ -2,37 +2,37 @@
     // Required methods
     fn <a href="#tymethod.encode_commands" class="fn">encode_commands</a>(
         &amp;self,
-        encoder: CommandEncoderId,
-        commands: <a class="struct" href="https://doc.rust-lang.org/1.84.1/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;Command&gt;,
-    ) -&gt; CommandBufferId;
+        encoder: <a class="type" href="../wgpu_core/id/type.CommandEncoderId.html" title="type wgpu_core::id::CommandEncoderId">CommandEncoderId</a>,
+        commands: <a class="struct" href="https://doc.rust-lang.org/1.84.1/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;<a class="enum" href="../wgpu_core/device/trace/enum.Command.html" title="enum wgpu_core::device::trace::Command">Command</a>&gt;,
+    ) -&gt; <a class="type" href="../wgpu_core/id/type.CommandBufferId.html" title="type wgpu_core::id::CommandBufferId">CommandBufferId</a>;
 <span class="item-spacer"></span>    fn <a href="#tymethod.process" class="fn">process</a>(
         &amp;self,
-        device: DeviceId,
-        queue: QueueId,
-        action: Action&lt;'_&gt;,
+        device: <a class="type" href="../wgpu_core/id/type.DeviceId.html" title="type wgpu_core::id::DeviceId">DeviceId</a>,
+        queue: <a class="type" href="../wgpu_core/id/type.QueueId.html" title="type wgpu_core::id::QueueId">QueueId</a>,
+        action: <a class="enum" href="../wgpu_core/device/trace/enum.Action.html" title="enum wgpu_core::device::trace::Action">Action</a>&lt;'_&gt;,
         dir: &amp;<a class="struct" href="https://doc.rust-lang.org/1.84.1/std/path/struct.Path.html" title="struct std::path::Path">Path</a>,
-        comb_manager: &amp;mut IdentityManager&lt;CommandBuffer&gt;,
+        comb_manager: &amp;mut <a class="struct" href="../wgpu_core/identity/struct.IdentityManager.html" title="struct wgpu_core::identity::IdentityManager">IdentityManager</a>&lt;<a class="enum" href="../wgpu_core/id/markers/enum.CommandBuffer.html" title="enum wgpu_core::id::markers::CommandBuffer">CommandBuffer</a>&gt;,
     );
 }</code></pre><h2 id="required-methods" class="section-header">Required Methods<a href="#required-methods" class="anchor">§</a></h2><div class="methods"><section id="tymethod.encode_commands" class="method"><a class="src rightside" href="../src/player/lib.rs.html#14-18">Source</a><h4 class="code-header">fn <a href="#tymethod.encode_commands" class="fn">encode_commands</a>(
     &amp;self,
-    encoder: CommandEncoderId,
-    commands: <a class="struct" href="https://doc.rust-lang.org/1.84.1/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;Command&gt;,
-) -&gt; CommandBufferId</h4></section><section id="tymethod.process" class="method"><a class="src rightside" href="../src/player/lib.rs.html#19-26">Source</a><h4 class="code-header">fn <a href="#tymethod.process" class="fn">process</a>(
+    encoder: <a class="type" href="../wgpu_core/id/type.CommandEncoderId.html" title="type wgpu_core::id::CommandEncoderId">CommandEncoderId</a>,
+    commands: <a class="struct" href="https://doc.rust-lang.org/1.84.1/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;<a class="enum" href="../wgpu_core/device/trace/enum.Command.html" title="enum wgpu_core::device::trace::Command">Command</a>&gt;,
+) -&gt; <a class="type" href="../wgpu_core/id/type.CommandBufferId.html" title="type wgpu_core::id::CommandBufferId">CommandBufferId</a></h4></section><section id="tymethod.process" class="method"><a class="src rightside" href="../src/player/lib.rs.html#19-26">Source</a><h4 class="code-header">fn <a href="#tymethod.process" class="fn">process</a>(
     &amp;self,
-    device: DeviceId,
-    queue: QueueId,
-    action: Action&lt;'_&gt;,
+    device: <a class="type" href="../wgpu_core/id/type.DeviceId.html" title="type wgpu_core::id::DeviceId">DeviceId</a>,
+    queue: <a class="type" href="../wgpu_core/id/type.QueueId.html" title="type wgpu_core::id::QueueId">QueueId</a>,
+    action: <a class="enum" href="../wgpu_core/device/trace/enum.Action.html" title="enum wgpu_core::device::trace::Action">Action</a>&lt;'_&gt;,
     dir: &amp;<a class="struct" href="https://doc.rust-lang.org/1.84.1/std/path/struct.Path.html" title="struct std::path::Path">Path</a>,
-    comb_manager: &amp;mut IdentityManager&lt;CommandBuffer&gt;,
-)</h4></section></div><h2 id="foreign-impls" class="section-header">Implementations on Foreign Types<a href="#foreign-impls" class="anchor">§</a></h2><details class="toggle implementors-toggle"><summary><section id="impl-GlobalPlay-for-Global" class="impl"><a class="src rightside" href="../src/player/lib.rs.html#29-428">Source</a><a href="#impl-GlobalPlay-for-Global" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.GlobalPlay.html" title="trait player::GlobalPlay">GlobalPlay</a> for Global</h3></section></summary><div class="impl-items"><section id="method.encode_commands" class="method trait-impl"><a class="src rightside" href="../src/player/lib.rs.html#30-181">Source</a><a href="#method.encode_commands" class="anchor">§</a><h4 class="code-header">fn <a href="#tymethod.encode_commands" class="fn">encode_commands</a>(
+    comb_manager: &amp;mut <a class="struct" href="../wgpu_core/identity/struct.IdentityManager.html" title="struct wgpu_core::identity::IdentityManager">IdentityManager</a>&lt;<a class="enum" href="../wgpu_core/id/markers/enum.CommandBuffer.html" title="enum wgpu_core::id::markers::CommandBuffer">CommandBuffer</a>&gt;,
+)</h4></section></div><h2 id="foreign-impls" class="section-header">Implementations on Foreign Types<a href="#foreign-impls" class="anchor">§</a></h2><details class="toggle implementors-toggle"><summary><section id="impl-GlobalPlay-for-Global" class="impl"><a class="src rightside" href="../src/player/lib.rs.html#29-428">Source</a><a href="#impl-GlobalPlay-for-Global" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.GlobalPlay.html" title="trait player::GlobalPlay">GlobalPlay</a> for <a class="struct" href="../wgpu_core/global/struct.Global.html" title="struct wgpu_core::global::Global">Global</a></h3></section></summary><div class="impl-items"><section id="method.encode_commands" class="method trait-impl"><a class="src rightside" href="../src/player/lib.rs.html#30-181">Source</a><a href="#method.encode_commands" class="anchor">§</a><h4 class="code-header">fn <a href="#tymethod.encode_commands" class="fn">encode_commands</a>(
     &amp;self,
-    encoder: CommandEncoderId,
-    commands: <a class="struct" href="https://doc.rust-lang.org/1.84.1/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;Command&gt;,
-) -&gt; CommandBufferId</h4></section><section id="method.process" class="method trait-impl"><a class="src rightside" href="../src/player/lib.rs.html#183-427">Source</a><a href="#method.process" class="anchor">§</a><h4 class="code-header">fn <a href="#tymethod.process" class="fn">process</a>(
+    encoder: <a class="type" href="../wgpu_core/id/type.CommandEncoderId.html" title="type wgpu_core::id::CommandEncoderId">CommandEncoderId</a>,
+    commands: <a class="struct" href="https://doc.rust-lang.org/1.84.1/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;<a class="enum" href="../wgpu_core/device/trace/enum.Command.html" title="enum wgpu_core::device::trace::Command">Command</a>&gt;,
+) -&gt; <a class="type" href="../wgpu_core/id/type.CommandBufferId.html" title="type wgpu_core::id::CommandBufferId">CommandBufferId</a></h4></section><section id="method.process" class="method trait-impl"><a class="src rightside" href="../src/player/lib.rs.html#183-427">Source</a><a href="#method.process" class="anchor">§</a><h4 class="code-header">fn <a href="#tymethod.process" class="fn">process</a>(
     &amp;self,
-    device: DeviceId,
-    queue: QueueId,
-    action: Action&lt;'_&gt;,
+    device: <a class="type" href="../wgpu_core/id/type.DeviceId.html" title="type wgpu_core::id::DeviceId">DeviceId</a>,
+    queue: <a class="type" href="../wgpu_core/id/type.QueueId.html" title="type wgpu_core::id::QueueId">QueueId</a>,
+    action: <a class="enum" href="../wgpu_core/device/trace/enum.Action.html" title="enum wgpu_core::device::trace::Action">Action</a>&lt;'_&gt;,
     dir: &amp;<a class="struct" href="https://doc.rust-lang.org/1.84.1/std/path/struct.Path.html" title="struct std::path::Path">Path</a>,
-    comb_manager: &amp;mut IdentityManager&lt;CommandBuffer&gt;,
+    comb_manager: &amp;mut <a class="struct" href="../wgpu_core/identity/struct.IdentityManager.html" title="struct wgpu_core::identity::IdentityManager">IdentityManager</a>&lt;<a class="enum" href="../wgpu_core/id/markers/enum.CommandBuffer.html" title="enum wgpu_core::id::markers::CommandBuffer">CommandBuffer</a>&gt;,
 )</h4></section></div></details><h2 id="implementors" class="section-header">Implementors<a href="#implementors" class="anchor">§</a></h2><div id="implementors-list"></div><script src="../trait.impl/player/trait.GlobalPlay.js" data-ignore-extern-crates="wgpu_core" async></script></section></div></main></body></html>

doc/search-index.js

@@ -781,7 +781,8 @@
 <a href="#780" id="780">780</a>
 <a href="#781" id="781">781</a>
 <a href="#782" id="782">782</a>
-<a href="#783" id="783">783</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{boxed::Box, string::String, sync::Arc, vec};
+<a href="#783" id="783">783</a>
+<a href="#784" id="784">784</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{boxed::Box, string::String, sync::Arc, vec};
 <span class="kw">use </span>core::{error, fmt, future::Future};
 
 <span class="kw">use </span><span class="kw">crate</span>::api::blas::{Blas, BlasGeometrySizeDescriptors, CreateBlasDescriptor};
@@ -1105,6 +1106,7 @@
     /// - `hal_buffer` must be created from this device internal handle
     /// - `hal_buffer` must be created respecting `desc`
     /// - `hal_buffer` must be initialized
+    /// - `hal_buffer` must not have zero size
     </span><span class="attr">#[cfg(wgpu_core)]
     #[must_use]
     </span><span class="kw">pub unsafe fn </span>create_buffer_from_hal&lt;A: wgc::hal_api::HalApi&gt;(

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

@@ -3686,7 +3686,13 @@
 <a href="#3685" id="3685">3685</a>
 <a href="#3686" id="3686">3686</a>
 <a href="#3687" id="3687">3687</a>
-<a href="#3688" id="3688">3688</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
+<a href="#3688" id="3688">3688</a>
+<a href="#3689" id="3689">3689</a>
+<a href="#3690" id="3690">3690</a>
+<a href="#3691" id="3691">3691</a>
+<a href="#3692" id="3692">3692</a>
+<a href="#3693" id="3693">3693</a>
+<a href="#3694" id="3694">3694</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
     borrow::Cow::{<span class="self">self</span>, Borrowed},
     boxed::Box,
     format,
@@ -3858,7 +3864,13 @@
         }
     }
 
-    <span class="kw">pub unsafe fn </span>create_buffer_from_hal&lt;A: wgc::hal_api::HalApi&gt;(
+    <span class="doccomment">/// # Safety
+    ///
+    /// - `hal_buffer` must be created from `device`.
+    /// - `hal_buffer` must be created respecting `desc`
+    /// - `hal_buffer` must be initialized
+    /// - `hal_buffer` must not have zero size.
+    </span><span class="kw">pub unsafe fn </span>create_buffer_from_hal&lt;A: wgc::hal_api::HalApi&gt;(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
         hal_buffer: A::Buffer,
         device: <span class="kw-2">&amp;</span>CoreDevice,

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

@@ -1236,7 +1236,34 @@
 <a href="#1235" id="1235">1235</a>
 <a href="#1236" id="1236">1236</a>
 <a href="#1237" id="1237">1237</a>
-<a href="#1238" id="1238">1238</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
+<a href="#1238" id="1238">1238</a>
+<a href="#1239" id="1239">1239</a>
+<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>
+<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></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
     borrow::{Cow, ToOwned},
     boxed::Box,
     string::String,
@@ -1332,15 +1359,48 @@
     }
 }
 
-<span class="comment">//TODO: refactor this to move out `enum BindingError`.
+<span class="attr">#[derive(Clone, Debug, Error)]
+#[non_exhaustive]
+</span><span class="kw">pub enum </span>BindingError {
+    <span class="attr">#[error(transparent)]
+    </span>DestroyedResource(<span class="attr">#[from] </span>DestroyedResourceError),
+    <span class="attr">#[error(<span class="string">"Buffer {buffer}: Binding with size {binding_size} at offset {offset} would overflow buffer size of {buffer_size}"</span>)]
+    </span>BindingRangeTooLarge {
+        buffer: ResourceErrorIdent,
+        offset: wgt::BufferAddress,
+        binding_size: u64,
+        buffer_size: u64,
+    },
+    <span class="attr">#[error(<span class="string">"Buffer {buffer}: Binding offset {offset} is greater than buffer size {buffer_size}"</span>)]
+    </span>BindingOffsetTooLarge {
+        buffer: ResourceErrorIdent,
+        offset: wgt::BufferAddress,
+        buffer_size: u64,
+    },
+}
 
+<span class="kw">impl </span>WebGpuError <span class="kw">for </span>BindingError {
+    <span class="kw">fn </span>webgpu_error_type(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; ErrorType {
+        <span class="kw">match </span><span class="self">self </span>{
+            <span class="self">Self</span>::DestroyedResource(e) =&gt; e.webgpu_error_type(),
+            <span class="self">Self</span>::BindingRangeTooLarge { .. } | <span class="self">Self</span>::BindingOffsetTooLarge { .. } =&gt; {
+                ErrorType::Validation
+            }
+        }
+    }
+}
+
+<span class="comment">// TODO: there may be additional variants here that can be extracted into
+// `BindingError`.
 </span><span class="attr">#[derive(Clone, Debug, Error)]
 #[non_exhaustive]
 </span><span class="kw">pub enum </span>CreateBindGroupError {
     <span class="attr">#[error(transparent)]
     </span>Device(<span class="attr">#[from] </span>DeviceError),
     <span class="attr">#[error(transparent)]
     </span>DestroyedResource(<span class="attr">#[from] </span>DestroyedResourceError),
+    <span class="attr">#[error(transparent)]
+    </span>BindingError(<span class="attr">#[from] </span>BindingError),
     <span class="attr">#[error(
         <span class="string">"Binding count declared with at most {expected} items, but {actual} items were provided"
     </span>)]
@@ -1351,12 +1411,6 @@
     </span>BindingArrayLengthMismatch { actual: usize, expected: usize },
     <span class="attr">#[error(<span class="string">"Array binding provided zero elements"</span>)]
     </span>BindingArrayZeroLength,
-    <span class="attr">#[error(<span class="string">"The bound range {range:?} of {buffer} overflows its size ({size})"</span>)]
-    </span>BindingRangeTooLarge {
-        buffer: ResourceErrorIdent,
-        range: Range&lt;wgt::BufferAddress&gt;,
-        size: u64,
-    },
     <span class="attr">#[error(<span class="string">"Binding size {actual} of {buffer} is less than minimum {min}"</span>)]
     </span>BindingSizeTooSmall {
         buffer: ResourceErrorIdent,
@@ -1471,14 +1525,14 @@
         <span class="kw">let </span>e: <span class="kw-2">&amp;</span><span class="kw">dyn </span>WebGpuError = <span class="kw">match </span><span class="self">self </span>{
             <span class="self">Self</span>::Device(e) =&gt; e,
             <span class="self">Self</span>::DestroyedResource(e) =&gt; e,
+            <span class="self">Self</span>::BindingError(e) =&gt; e,
             <span class="self">Self</span>::MissingBufferUsage(e) =&gt; e,
             <span class="self">Self</span>::MissingTextureUsage(e) =&gt; e,
             <span class="self">Self</span>::ResourceUsageCompatibility(e) =&gt; e,
             <span class="self">Self</span>::InvalidResource(e) =&gt; e,
             <span class="self">Self</span>::BindingArrayPartialLengthMismatch { .. }
             | <span class="self">Self</span>::BindingArrayLengthMismatch { .. }
             | <span class="self">Self</span>::BindingArrayZeroLength
-            | <span class="self">Self</span>::BindingRangeTooLarge { .. }
             | <span class="self">Self</span>::BindingSizeTooSmall { .. }
             | <span class="self">Self</span>::BindingsNumMismatch { .. }
             | <span class="self">Self</span>::BindingZeroSize(<span class="kw">_</span>)