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

Author: teoxoy

doc/search-index.js

@@ -1690,88 +1690,7 @@
 <a href="#1689" id="1689">1689</a>
 <a href="#1690" id="1690">1690</a>
 <a href="#1691" id="1691">1691</a>
-<a href="#1692" id="1692">1692</a>
-<a href="#1693" id="1693">1693</a>
-<a href="#1694" id="1694">1694</a>
-<a href="#1695" id="1695">1695</a>
-<a href="#1696" id="1696">1696</a>
-<a href="#1697" id="1697">1697</a>
-<a href="#1698" id="1698">1698</a>
-<a href="#1699" id="1699">1699</a>
-<a href="#1700" id="1700">1700</a>
-<a href="#1701" id="1701">1701</a>
-<a href="#1702" id="1702">1702</a>
-<a href="#1703" id="1703">1703</a>
-<a href="#1704" id="1704">1704</a>
-<a href="#1705" id="1705">1705</a>
-<a href="#1706" id="1706">1706</a>
-<a href="#1707" id="1707">1707</a>
-<a href="#1708" id="1708">1708</a>
-<a href="#1709" id="1709">1709</a>
-<a href="#1710" id="1710">1710</a>
-<a href="#1711" id="1711">1711</a>
-<a href="#1712" id="1712">1712</a>
-<a href="#1713" id="1713">1713</a>
-<a href="#1714" id="1714">1714</a>
-<a href="#1715" id="1715">1715</a>
-<a href="#1716" id="1716">1716</a>
-<a href="#1717" id="1717">1717</a>
-<a href="#1718" id="1718">1718</a>
-<a href="#1719" id="1719">1719</a>
-<a href="#1720" id="1720">1720</a>
-<a href="#1721" id="1721">1721</a>
-<a href="#1722" id="1722">1722</a>
-<a href="#1723" id="1723">1723</a>
-<a href="#1724" id="1724">1724</a>
-<a href="#1725" id="1725">1725</a>
-<a href="#1726" id="1726">1726</a>
-<a href="#1727" id="1727">1727</a>
-<a href="#1728" id="1728">1728</a>
-<a href="#1729" id="1729">1729</a>
-<a href="#1730" id="1730">1730</a>
-<a href="#1731" id="1731">1731</a>
-<a href="#1732" id="1732">1732</a>
-<a href="#1733" id="1733">1733</a>
-<a href="#1734" id="1734">1734</a>
-<a href="#1735" id="1735">1735</a>
-<a href="#1736" id="1736">1736</a>
-<a href="#1737" id="1737">1737</a>
-<a href="#1738" id="1738">1738</a>
-<a href="#1739" id="1739">1739</a>
-<a href="#1740" id="1740">1740</a>
-<a href="#1741" id="1741">1741</a>
-<a href="#1742" id="1742">1742</a>
-<a href="#1743" id="1743">1743</a>
-<a href="#1744" id="1744">1744</a>
-<a href="#1745" id="1745">1745</a>
-<a href="#1746" id="1746">1746</a>
-<a href="#1747" id="1747">1747</a>
-<a href="#1748" id="1748">1748</a>
-<a href="#1749" id="1749">1749</a>
-<a href="#1750" id="1750">1750</a>
-<a href="#1751" id="1751">1751</a>
-<a href="#1752" id="1752">1752</a>
-<a href="#1753" id="1753">1753</a>
-<a href="#1754" id="1754">1754</a>
-<a href="#1755" id="1755">1755</a>
-<a href="#1756" id="1756">1756</a>
-<a href="#1757" id="1757">1757</a>
-<a href="#1758" id="1758">1758</a>
-<a href="#1759" id="1759">1759</a>
-<a href="#1760" id="1760">1760</a>
-<a href="#1761" id="1761">1761</a>
-<a href="#1762" id="1762">1762</a>
-<a href="#1763" id="1763">1763</a>
-<a href="#1764" id="1764">1764</a>
-<a href="#1765" id="1765">1765</a>
-<a href="#1766" id="1766">1766</a>
-<a href="#1767" id="1767">1767</a>
-<a href="#1768" id="1768">1768</a>
-<a href="#1769" id="1769">1769</a>
-<a href="#1770" id="1770">1770</a>
-<a href="#1771" id="1771">1771</a>
-<a href="#1772" id="1772">1772</a>
-<a href="#1773" id="1773">1773</a></pre></div><pre class="rust"><code><span class="doccomment">/*! Render Bundles
+<a href="#1692" id="1692">1692</a></pre></div><pre class="rust"><code><span class="doccomment">/*! Render Bundles
 
 A render bundle is a prerecorded sequence of commands that can be replayed on a
 command encoder with a single call. A single bundle can replayed any number of
@@ -1884,91 +1803,6 @@
     DrawKind,
 };
 
-<span class="doccomment">/// &lt;https://gpuweb.github.io/gpuweb/#dom-gpurendercommandsmixin-draw&gt;
-</span><span class="kw">fn </span>validate_draw(
-    vertex: <span class="kw-2">&amp;</span>[<span class="prelude-ty">Option</span>&lt;VertexState&gt;],
-    step: <span class="kw-2">&amp;</span>[VertexStep],
-    first_vertex: u32,
-    vertex_count: u32,
-    first_instance: u32,
-    instance_count: u32,
-) -&gt; <span class="prelude-ty">Result</span>&lt;(), DrawError&gt; {
-    <span class="kw">let </span>vertices_end = first_vertex <span class="kw">as </span>u64 + vertex_count <span class="kw">as </span>u64;
-    <span class="kw">let </span>instances_end = first_instance <span class="kw">as </span>u64 + instance_count <span class="kw">as </span>u64;
-
-    <span class="kw">for </span>(idx, (vbs, step)) <span class="kw">in </span>vertex.iter().zip(step).enumerate() {
-        <span class="kw">let </span><span class="prelude-val">Some</span>(vbs) = vbs <span class="kw">else </span>{
-            <span class="kw">continue</span>;
-        };
-
-        <span class="kw">let </span>stride_count = <span class="kw">match </span>step.mode {
-            wgt::VertexStepMode::Vertex =&gt; vertices_end,
-            wgt::VertexStepMode::Instance =&gt; instances_end,
-        };
-
-        <span class="kw">if </span>stride_count == <span class="number">0 </span>{
-            <span class="kw">continue</span>;
-        }
-
-        <span class="kw">let </span>offset = (stride_count - <span class="number">1</span>) * step.stride + step.last_stride;
-        <span class="kw">let </span>limit = vbs.range.end - vbs.range.start;
-        <span class="kw">if </span>offset &gt; limit {
-            <span class="kw">return </span><span class="prelude-val">Err</span>(DrawError::VertexOutOfBounds {
-                step_mode: step.mode,
-                offset,
-                limit,
-                slot: idx <span class="kw">as </span>u32,
-            });
-        }
-    }
-
-    <span class="prelude-val">Ok</span>(())
-}
-
-<span class="comment">// See https://gpuweb.github.io/gpuweb/#dom-gpurendercommandsmixin-drawindexed
-</span><span class="kw">fn </span>validate_indexed_draw(
-    vertex: <span class="kw-2">&amp;</span>[<span class="prelude-ty">Option</span>&lt;VertexState&gt;],
-    step: <span class="kw-2">&amp;</span>[VertexStep],
-    index_state: <span class="kw-2">&amp;</span>IndexState,
-    first_index: u32,
-    index_count: u32,
-    first_instance: u32,
-    instance_count: u32,
-) -&gt; <span class="prelude-ty">Result</span>&lt;(), DrawError&gt; {
-    <span class="kw">let </span>last_index = first_index <span class="kw">as </span>u64 + index_count <span class="kw">as </span>u64;
-    <span class="kw">let </span>index_limit = index_state.limit();
-    <span class="kw">if </span>last_index &gt; index_limit {
-        <span class="kw">return </span><span class="prelude-val">Err</span>(DrawError::IndexBeyondLimit {
-            last_index,
-            index_limit,
-        });
-    }
-
-    <span class="kw">let </span>stride_count = first_instance <span class="kw">as </span>u64 + instance_count <span class="kw">as </span>u64;
-    <span class="kw">for </span>(idx, (vbs, step)) <span class="kw">in </span>vertex.iter().zip(step).enumerate() {
-        <span class="kw">let </span><span class="prelude-val">Some</span>(vbs) = vbs <span class="kw">else </span>{
-            <span class="kw">continue</span>;
-        };
-
-        <span class="kw">if </span>stride_count == <span class="number">0 </span>|| step.mode != wgt::VertexStepMode::Instance {
-            <span class="kw">continue</span>;
-        }
-
-        <span class="kw">let </span>offset = (stride_count - <span class="number">1</span>) * step.stride + step.last_stride;
-        <span class="kw">let </span>limit = vbs.range.end - vbs.range.start;
-        <span class="kw">if </span>offset &gt; limit {
-            <span class="kw">return </span><span class="prelude-val">Err</span>(DrawError::VertexOutOfBounds {
-                step_mode: step.mode,
-                offset,
-                limit,
-                slot: idx <span class="kw">as </span>u32,
-            });
-        }
-    }
-
-    <span class="prelude-val">Ok</span>(())
-}
-
 <span class="doccomment">/// Describes a [`RenderBundleEncoder`].
 </span><span class="attr">#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = <span class="string">"serde"</span>, derive(serde::Serialize, serde::Deserialize))]
@@ -2132,7 +1966,7 @@
             trackers: RenderBundleScope::new(),
             pipeline: <span class="prelude-val">None</span>,
             bind: (<span class="number">0</span>..hal::MAX_BIND_GROUPS).map(|<span class="kw">_</span>| <span class="prelude-val">None</span>).collect(),
-            vertex: (<span class="number">0</span>..hal::MAX_VERTEX_BUFFERS).map(|<span class="kw">_</span>| <span class="prelude-val">None</span>).collect(),
+            vertex: Default::default(),
             index: <span class="prelude-val">None</span>,
             flat_dynamic_offsets: Vec::new(),
             device: device.clone(),
@@ -2554,14 +2388,9 @@
     <span class="kw">let </span>pipeline = state.pipeline()<span class="question-mark">?</span>;
     <span class="kw">let </span>used_bind_groups = pipeline.used_bind_groups;
 
-    validate_draw(
-        <span class="kw-2">&amp;</span>state.vertex[..],
-        <span class="kw-2">&amp;</span>pipeline.steps,
-        first_vertex,
-        vertex_count,
-        first_instance,
-        instance_count,
-    )<span class="question-mark">?</span>;
+    <span class="kw">let </span>vertex_limits = <span class="kw">super</span>::VertexLimits::new(state.vertex_buffer_sizes(), <span class="kw-2">&amp;</span>pipeline.steps);
+    vertex_limits.validate_vertex_limit(first_vertex, vertex_count)<span class="question-mark">?</span>;
+    vertex_limits.validate_instance_limit(first_instance, instance_count)<span class="question-mark">?</span>;
 
     <span class="kw">if </span>instance_count &gt; <span class="number">0 </span>&amp;&amp; vertex_count &gt; <span class="number">0 </span>{
         state.flush_vertices();
@@ -2592,15 +2421,18 @@
         <span class="prelude-val">None </span>=&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(DrawError::MissingIndexBuffer.into()),
     };
 
-    validate_indexed_draw(
-        <span class="kw-2">&amp;</span>state.vertex[..],
-        <span class="kw-2">&amp;</span>pipeline.steps,
-        index,
-        first_index,
-        index_count,
-        first_instance,
-        instance_count,
-    )<span class="question-mark">?</span>;
+    <span class="kw">let </span>vertex_limits = <span class="kw">super</span>::VertexLimits::new(state.vertex_buffer_sizes(), <span class="kw-2">&amp;</span>pipeline.steps);
+
+    <span class="kw">let </span>last_index = first_index <span class="kw">as </span>u64 + index_count <span class="kw">as </span>u64;
+    <span class="kw">let </span>index_limit = index.limit();
+    <span class="kw">if </span>last_index &gt; index_limit {
+        <span class="kw">return </span><span class="prelude-val">Err</span>(DrawError::IndexBeyondLimit {
+            last_index,
+            index_limit,
+        }
+        .into());
+    }
+    vertex_limits.validate_instance_limit(first_instance, instance_count)<span class="question-mark">?</span>;
 
     <span class="kw">if </span>instance_count &gt; <span class="number">0 </span>&amp;&amp; index_count &gt; <span class="number">0 </span>{
         state.flush_index();
@@ -3103,7 +2935,7 @@
     </span>bind: ArrayVec&lt;<span class="prelude-ty">Option</span>&lt;BindState&gt;, { hal::MAX_BIND_GROUPS }&gt;,
 
     <span class="doccomment">/// The state of each vertex buffer slot.
-    </span>vertex: ArrayVec&lt;<span class="prelude-ty">Option</span>&lt;VertexState&gt;, { hal::MAX_VERTEX_BUFFERS }&gt;,
+    </span>vertex: [<span class="prelude-ty">Option</span>&lt;VertexState&gt;; hal::MAX_VERTEX_BUFFERS],
 
     <span class="doccomment">/// The current index buffer, if one has been set. We flush this state
     /// before indexed draw commands.
@@ -3286,6 +3118,12 @@
 
         <span class="self">self</span>.commands.extend(commands);
     }
+
+    <span class="kw">fn </span>vertex_buffer_sizes(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="kw">impl </span>Iterator&lt;Item = <span class="prelude-ty">Option</span>&lt;wgt::BufferAddress&gt;&gt; + <span class="lifetime">'_ </span>{
+        <span class="self">self</span>.vertex
+            .iter()
+            .map(|vbs| vbs.as_ref().map(|vbs| vbs.range.end - vbs.range.start))
+    }
 }
 
 <span class="doccomment">/// Error encountered when finishing recording a render bundle.

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

@@ -97,23 +97,14 @@
 <a href="#96" id="96">96</a>
 <a href="#97" id="97">97</a>
 <a href="#98" id="98">98</a>
-<a href="#99" id="99">99</a>
-<a href="#100" id="100">100</a>
-<a href="#101" id="101">101</a>
-<a href="#102" id="102">102</a>
-<a href="#103" id="103">103</a>
-<a href="#104" id="104">104</a>
-<a href="#105" id="105">105</a>
-<a href="#106" id="106">106</a>
-<a href="#107" id="107">107</a></pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
+<a href="#99" id="99">99</a></pre></div><pre class="rust"><code><span class="kw">use crate</span>::{
     binding_model::{LateMinBufferBindingSizeMismatch, PushConstantUploadError},
     resource::{
         DestroyedResourceError, MissingBufferUsageError, MissingTextureUsageError,
         ResourceErrorIdent,
     },
     track::ResourceUsageCompatibilityError,
 };
-<span class="kw">use </span>wgt::VertexStepMode;
 
 <span class="kw">use </span>thiserror::Error;
 
@@ -142,13 +133,6 @@
         vertex_limit: u64,
         slot: u32,
     },
-    <span class="attr">#[error(<span class="string">"{step_mode:?} buffer out of bounds at slot {slot}. Offset {offset} beyond limit {limit}. Did you bind the correct `Vertex` step-rate vertex buffer?"</span>)]
-    </span>VertexOutOfBounds {
-        step_mode: VertexStepMode,
-        offset: u64,
-        limit: u64,
-        slot: u32,
-    },
     <span class="attr">#[error(<span class="string">"Instance {last_instance} extends beyond limit {instance_limit} imposed by the buffer in slot {slot}. Did you bind the correct `Instance` step-rate vertex buffer?"</span>)]
     </span>InstanceBeyondLimit {
         last_instance: u64,