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

Author: cwfitzgerald

doc/search-index.js

@@ -215,7 +215,8 @@
 <a href="#214" id="214">214</a>
 <a href="#215" id="215">215</a>
 <a href="#216" id="216">216</a>
-<a href="#217" id="217">217</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{boxed::Box, vec::Vec};
+<a href="#217" id="217">217</a>
+<a href="#218" id="218">218</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{boxed::Box, vec::Vec};
 
 <span class="kw">use </span>wgt::WasmNotSendSync;
 
@@ -317,7 +318,8 @@
     </span><span class="kw">pub </span>vertex_buffer: <span class="kw-2">&amp;</span><span class="lifetime">'a </span>Buffer,
     <span class="doccomment">/// Offset into the vertex buffer as a factor of the vertex stride.
     </span><span class="kw">pub </span>first_vertex: u32,
-    <span class="doccomment">/// Vertex stride.
+    <span class="doccomment">/// Vertex stride, must be greater than [`wgpu_types::VertexFormat::min_acceleration_structure_vertex_stride`]
+    /// of the format and must be a multiple of [`wgpu_types::VertexFormat::acceleration_structure_stride_alignment`].
     </span><span class="kw">pub </span>vertex_stride: wgt::BufferAddress,
     <span class="doccomment">/// Index buffer (optional).
     </span><span class="kw">pub </span>index_buffer: <span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;</span><span class="lifetime">'a </span>Buffer&gt;,

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

@@ -1267,7 +1267,36 @@
 <a href="#1266" id="1266">1266</a>
 <a href="#1267" id="1267">1267</a>
 <a href="#1268" id="1268">1268</a>
-<a href="#1269" id="1269">1269</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{boxed::Box, sync::Arc, vec::Vec};
+<a href="#1269" id="1269">1269</a>
+<a href="#1270" id="1270">1270</a>
+<a href="#1271" id="1271">1271</a>
+<a href="#1272" id="1272">1272</a>
+<a href="#1273" id="1273">1273</a>
+<a href="#1274" id="1274">1274</a>
+<a href="#1275" id="1275">1275</a>
+<a href="#1276" id="1276">1276</a>
+<a href="#1277" id="1277">1277</a>
+<a href="#1278" id="1278">1278</a>
+<a href="#1279" id="1279">1279</a>
+<a href="#1280" id="1280">1280</a>
+<a href="#1281" id="1281">1281</a>
+<a href="#1282" id="1282">1282</a>
+<a href="#1283" id="1283">1283</a>
+<a href="#1284" id="1284">1284</a>
+<a href="#1285" id="1285">1285</a>
+<a href="#1286" id="1286">1286</a>
+<a href="#1287" id="1287">1287</a>
+<a href="#1288" id="1288">1288</a>
+<a href="#1289" id="1289">1289</a>
+<a href="#1290" id="1290">1290</a>
+<a href="#1291" id="1291">1291</a>
+<a href="#1292" id="1292">1292</a>
+<a href="#1293" id="1293">1293</a>
+<a href="#1294" id="1294">1294</a>
+<a href="#1295" id="1295">1295</a>
+<a href="#1296" id="1296">1296</a>
+<a href="#1297" id="1297">1297</a>
+<a href="#1298" id="1298">1298</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{boxed::Box, sync::Arc, vec::Vec};
 <span class="kw">use </span>core::{
     cmp::max,
     num::NonZeroU64,
@@ -2167,6 +2196,35 @@
                         ));
                     }
 
+                    <span class="kw">if </span>size_desc
+                        .vertex_format
+                        .min_acceleration_structure_vertex_stride()
+                        &gt; mesh.vertex_stride
+                    {
+                        <span class="kw">return </span><span class="prelude-val">Err</span>(BuildAccelerationStructureError::VertexStrideTooSmall(
+                            blas.error_ident(),
+                            size_desc
+                                .vertex_format
+                                .min_acceleration_structure_vertex_stride(),
+                            mesh.vertex_stride,
+                        ));
+                    }
+
+                    <span class="kw">if </span>mesh.vertex_stride
+                        % size_desc
+                            .vertex_format
+                            .acceleration_structure_stride_alignment()
+                        != <span class="number">0
+                    </span>{
+                        <span class="kw">return </span><span class="prelude-val">Err</span>(BuildAccelerationStructureError::VertexStrideUnaligned(
+                            blas.error_ident(),
+                            size_desc
+                                .vertex_format
+                                .acceleration_structure_stride_alignment(),
+                            mesh.vertex_stride,
+                        ));
+                    }
+
                     <span class="kw">match </span>(size_desc.index_count, mesh.size.index_count) {
                         (<span class="prelude-val">Some</span>(<span class="kw">_</span>), <span class="prelude-val">None</span>) | (<span class="prelude-val">None</span>, <span class="prelude-val">Some</span>(<span class="kw">_</span>)) =&gt; {
                             <span class="kw">return </span><span class="prelude-val">Err</span>(

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

@@ -253,7 +253,13 @@
 <a href="#252" id="252">252</a>
 <a href="#253" id="253">253</a>
 <a href="#254" id="254">254</a>
-<a href="#255" id="255">255</a></pre></div><pre class="rust"><code><span class="comment">// Ray tracing
+<a href="#255" id="255">255</a>
+<a href="#256" id="256">256</a>
+<a href="#257" id="257">257</a>
+<a href="#258" id="258">258</a>
+<a href="#259" id="259">259</a>
+<a href="#260" id="260">260</a>
+<a href="#261" id="261">261</a></pre></div><pre class="rust"><code><span class="comment">// Ray tracing
 // Major missing optimizations (no api surface changes needed):
 // - use custom tracker to track build state
 // - no forced rebuilt (build mode deduction)
@@ -357,6 +363,12 @@
     <span class="attr">#[error(<span class="string">"Blas {0:?} vertex formats are different, creation format: {1:?}, provided: {2:?}"</span>)]
     </span>DifferentBlasVertexFormats(ResourceErrorIdent, VertexFormat, VertexFormat),
 
+    <span class="attr">#[error(<span class="string">"Blas {0:?} stride was required to be at least {1} but stride given was {2}"</span>)]
+    </span>VertexStrideTooSmall(ResourceErrorIdent, u64, u64),
+
+    <span class="attr">#[error(<span class="string">"Blas {0:?} stride was required to be a multiple of {1} but stride given was {2}"</span>)]
+    </span>VertexStrideUnaligned(ResourceErrorIdent, u64, u64),
+
     <span class="attr">#[error(<span class="string">"Blas {0:?} index count was provided at creation or building, but not the other"</span>)]
     </span>BlasIndexCountProvidedMismatch(ResourceErrorIdent),
 

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

@@ -2757,7 +2757,8 @@
 <a href="#2756" id="2756">2756</a>
 <a href="#2757" id="2757">2757</a>
 <a href="#2758" id="2758">2758</a>
-<a href="#2759" id="2759">2759</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{borrow::ToOwned <span class="kw">as _</span>, collections::BTreeMap, sync::Arc, vec::Vec};
+<a href="#2759" id="2759">2759</a>
+<a href="#2760" id="2760">2760</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{borrow::ToOwned <span class="kw">as _</span>, collections::BTreeMap, sync::Arc, vec::Vec};
 <span class="kw">use </span>core::ffi::CStr;
 
 <span class="kw">use </span>ash::{ext, google, khr, vk};
@@ -3558,7 +3559,8 @@
         features.set(F::DEPTH32FLOAT_STENCIL8, texture_d32_s8);
 
         features.set(
-            F::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE,
+            F::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE
+                | F::EXTENDED_ACCELERATION_STRUCTURE_VERTEX_FORMATS,
             caps.supports_extension(khr::deferred_host_operations::NAME)
                 &amp;&amp; caps.supports_extension(khr::acceleration_structure::NAME)
                 &amp;&amp; caps.supports_extension(khr::buffer_device_address::NAME),

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

@@ -1597,7 +1597,23 @@
 <a href="#1596" id="1596">1596</a>
 <a href="#1597" id="1597">1597</a>
 <a href="#1598" id="1598">1598</a>
-<a href="#1599" id="1599">1599</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">crate</span>::VertexFormat;
+<a href="#1599" id="1599">1599</a>
+<a href="#1600" id="1600">1600</a>
+<a href="#1601" id="1601">1601</a>
+<a href="#1602" id="1602">1602</a>
+<a href="#1603" id="1603">1603</a>
+<a href="#1604" id="1604">1604</a>
+<a href="#1605" id="1605">1605</a>
+<a href="#1606" id="1606">1606</a>
+<a href="#1607" id="1607">1607</a>
+<a href="#1608" id="1608">1608</a>
+<a href="#1609" id="1609">1609</a>
+<a href="#1610" id="1610">1610</a>
+<a href="#1611" id="1611">1611</a>
+<a href="#1612" id="1612">1612</a>
+<a href="#1613" id="1613">1613</a>
+<a href="#1614" id="1614">1614</a>
+<a href="#1615" id="1615">1615</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">crate</span>::VertexFormat;
 <span class="attr">#[cfg(feature = <span class="string">"serde"</span>)]
 </span><span class="kw">use </span>alloc::fmt;
 <span class="kw">use </span>alloc::vec::Vec;
@@ -2816,6 +2832,15 @@
         ///
         /// This is a native only feature.
         </span><span class="kw">const </span>EXPERIMENTAL_MESH_SHADER_MULTIVIEW = <span class="number">1 </span>&lt;&lt; <span class="number">49</span>;
+
+        <span class="doccomment">/// Allows usage of additional vertex formats in [BlasTriangleGeometrySizeDescriptor::vertex_format]
+        ///
+        /// Supported platforms
+        /// - Vulkan
+        /// - DX12
+        ///
+        /// [BlasTriangleGeometrySizeDescriptor::vertex_format]: super::BlasTriangleGeometrySizeDescriptor
+        </span><span class="kw">const </span>EXTENDED_ACCELERATION_STRUCTURE_VERTEX_FORMATS = <span class="number">1 </span>&lt;&lt; <span class="number">50</span>;
     }
 
     <span class="doccomment">/// Features that are not guaranteed to be supported.
@@ -3083,6 +3108,13 @@
         <span class="kw">if </span><span class="self">self</span>.contains(<span class="self">Self</span>::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE) {
             formats.push(VertexFormat::Float32x3);
         }
+        <span class="kw">if </span><span class="self">self</span>.contains(<span class="self">Self</span>::EXTENDED_ACCELERATION_STRUCTURE_VERTEX_FORMATS) {
+            formats.push(VertexFormat::Float32x2);
+            formats.push(VertexFormat::Float16x2);
+            formats.push(VertexFormat::Float16x4);
+            formats.push(VertexFormat::Snorm16x2);
+            formats.push(VertexFormat::Snorm16x4);
+        }
         formats
     }
 }

doc/src/wgpu_core/command/ray_tracing.rs.html

@@ -7780,7 +7780,37 @@
 <a href="#7779" id="7779">7779</a>
 <a href="#7780" id="7780">7780</a>
 <a href="#7781" id="7781">7781</a>
-<a href="#7782" id="7782">7782</a></pre></div><pre class="rust"><code><span class="doccomment">//! This library describes the API surface of WebGPU that is agnostic of the backend.
+<a href="#7782" id="7782">7782</a>
+<a href="#7783" id="7783">7783</a>
+<a href="#7784" id="7784">7784</a>
+<a href="#7785" id="7785">7785</a>
+<a href="#7786" id="7786">7786</a>
+<a href="#7787" id="7787">7787</a>
+<a href="#7788" id="7788">7788</a>
+<a href="#7789" id="7789">7789</a>
+<a href="#7790" id="7790">7790</a>
+<a href="#7791" id="7791">7791</a>
+<a href="#7792" id="7792">7792</a>
+<a href="#7793" id="7793">7793</a>
+<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>
+<a href="#7799" id="7799">7799</a>
+<a href="#7800" id="7800">7800</a>
+<a href="#7801" id="7801">7801</a>
+<a href="#7802" id="7802">7802</a>
+<a href="#7803" id="7803">7803</a>
+<a href="#7804" id="7804">7804</a>
+<a href="#7805" id="7805">7805</a>
+<a href="#7806" id="7806">7806</a>
+<a href="#7807" id="7807">7807</a>
+<a href="#7808" id="7808">7808</a>
+<a href="#7809" id="7809">7809</a>
+<a href="#7810" id="7810">7810</a>
+<a href="#7811" id="7811">7811</a>
+<a href="#7812" id="7812">7812</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.
 
 </span><span class="attr">#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
@@ -12756,6 +12786,36 @@
             <span class="self">Self</span>::Float64x4 =&gt; <span class="number">32</span>,
         }
     }
+
+    <span class="doccomment">/// Returns the size read by an acceleration structure build of the vertex format. This is
+    /// slightly different from [`Self::size`] because the alpha component of 4-component formats
+    /// are not read in an acceleration structure build, allowing for a smaller stride.
+    </span><span class="attr">#[must_use]
+    </span><span class="kw">pub const fn </span>min_acceleration_structure_vertex_stride(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; u64 {
+        <span class="kw">match </span><span class="self">self </span>{
+            <span class="self">Self</span>::Float16x2 | <span class="self">Self</span>::Snorm16x2 =&gt; <span class="number">4</span>,
+            <span class="self">Self</span>::Float32x3 =&gt; <span class="number">12</span>,
+            <span class="self">Self</span>::Float32x2 =&gt; <span class="number">8</span>,
+            <span class="comment">// This is the minimum value from DirectX
+            // &gt; A16 component is ignored, other data can be packed there, such as setting vertex stride to 6 bytes
+            //
+            // https://microsoft.github.io/DirectX-Specs/d3d/Raytracing.html#d3d12_raytracing_geometry_triangles_desc
+            //
+            // Vulkan does not express a minimum stride.
+            </span><span class="self">Self</span>::Float16x4 | <span class="self">Self</span>::Snorm16x4 =&gt; <span class="number">6</span>,
+            <span class="kw">_ </span>=&gt; <span class="macro">unreachable!</span>(),
+        }
+    }
+
+    <span class="doccomment">/// Returns the alignment required for `wgpu::BlasTriangleGeometry::vertex_stride`
+    </span><span class="attr">#[must_use]
+    </span><span class="kw">pub const fn </span>acceleration_structure_stride_alignment(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; u64 {
+        <span class="kw">match </span><span class="self">self </span>{
+            <span class="self">Self</span>::Float16x4 | <span class="self">Self</span>::Float16x2 | <span class="self">Self</span>::Snorm16x4 | <span class="self">Self</span>::Snorm16x2 =&gt; <span class="number">2</span>,
+            <span class="self">Self</span>::Float32x2 | <span class="self">Self</span>::Float32x3 =&gt; <span class="number">4</span>,
+            <span class="kw">_ </span>=&gt; <span class="macro">unreachable!</span>(),
+        }
+    }
 }
 
 <span class="macro">bitflags::bitflags!</span> {
@@ -15218,7 +15278,7 @@
 </span><span class="kw">pub struct </span>BlasTriangleGeometrySizeDescriptor {
     <span class="doccomment">/// Format of a vertex position, must be [`VertexFormat::Float32x3`]
     /// with just [`Features::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE`]
-    /// but later features may add more formats.
+    /// but [`Features::EXTENDED_ACCELERATION_STRUCTURE_VERTEX_FORMATS`] adds more.
     </span><span class="kw">pub </span>vertex_format: VertexFormat,
     <span class="doccomment">/// Number of vertices.
     </span><span class="kw">pub </span>vertex_count: u32,