Deploying to master from @ gfx-rs/wgpu@20bad46 🚀

Author: cwfitzgerald

doc/search-index.js

@@ -2634,7 +2634,14 @@
 <a href="#2633" id="2633">2633</a>
 <a href="#2634" id="2634">2634</a>
 <a href="#2635" id="2635">2635</a>
-<a href="#2636" id="2636">2636</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{borrow::ToOwned <span class="kw">as _</span>, collections::BTreeMap, ffi::CStr, sync::Arc, vec::Vec};
+<a href="#2636" id="2636">2636</a>
+<a href="#2637" id="2637">2637</a>
+<a href="#2638" id="2638">2638</a>
+<a href="#2639" id="2639">2639</a>
+<a href="#2640" id="2640">2640</a>
+<a href="#2641" id="2641">2641</a>
+<a href="#2642" id="2642">2642</a>
+<a href="#2643" id="2643">2643</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{borrow::ToOwned <span class="kw">as _</span>, collections::BTreeMap, ffi::CStr, sync::Arc, vec::Vec};
 
 <span class="kw">use </span>ash::{amd, ext, google, khr, vk};
 <span class="kw">use </span>parking_lot::Mutex;
@@ -3131,19 +3138,20 @@
                 <span class="prelude-val">None
             </span>},
             mesh_shader: <span class="kw">if </span>enabled_extensions.contains(<span class="kw-2">&amp;</span>ext::mesh_shader::NAME) {
-                <span class="kw">let </span>needed = requested_features.contains(wgt::Features::MESH_SHADER);
+                <span class="kw">let </span>needed = requested_features.contains(wgt::Features::EXPERIMENTAL_MESH_SHADER);
+                <span class="kw">let </span>multiview_needed =
+                    requested_features.contains(wgt::Features::EXPERIMENTAL_MESH_SHADER_MULTIVIEW);
                 <span class="prelude-val">Some</span>(
                     vk::PhysicalDeviceMeshShaderFeaturesEXT::default()
                         .mesh_shader(needed)
                         .task_shader(needed)
-                        <span class="comment">// Multiview needs some special work https://github.com/gfx-rs/wgpu/issues/7262
-                        </span>.multiview_mesh_shader(<span class="bool-val">false</span>),
+                        .multiview_mesh_shader(multiview_needed),
                 )
             } <span class="kw">else </span>{
                 <span class="prelude-val">None
             </span>},
             maintenance4: <span class="kw">if </span>enabled_extensions.contains(<span class="kw-2">&amp;</span>khr::maintenance4::NAME) {
-                <span class="kw">let </span>needed = requested_features.contains(wgt::Features::MESH_SHADER);
+                <span class="kw">let </span>needed = requested_features.contains(wgt::Features::EXPERIMENTAL_MESH_SHADER);
                 <span class="prelude-val">Some</span>(vk::PhysicalDeviceMaintenance4FeaturesKHR::default().maintenance4(needed))
             } <span class="kw">else </span>{
                 <span class="prelude-val">None
@@ -3472,9 +3480,15 @@
             caps.supports_extension(khr::external_memory_win32::NAME),
         );
         features.set(
-            F::MESH_SHADER,
+            F::EXPERIMENTAL_MESH_SHADER,
             caps.supports_extension(ext::mesh_shader::NAME),
         );
+        <span class="kw">if let </span><span class="prelude-val">Some</span>(<span class="kw-2">ref </span>mesh_shader) = <span class="self">self</span>.mesh_shader {
+            features.set(
+                F::EXPERIMENTAL_MESH_SHADER_MULTIVIEW,
+                mesh_shader.multiview_mesh_shader != <span class="number">0</span>,
+            );
+        }
         (features, dl_flags)
     }
 }
@@ -3641,7 +3655,7 @@
                 }
             }
 
-            <span class="kw">if </span>requested_features.intersects(wgt::Features::MESH_SHADER) {
+            <span class="kw">if </span>requested_features.intersects(wgt::Features::EXPERIMENTAL_MESH_SHADER) {
                 extensions.push(khr::spirv_1_4::NAME);
             }
 
@@ -3660,7 +3674,7 @@
                 extensions.push(ext::subgroup_size_control::NAME);
             }
 
-            <span class="kw">if </span>requested_features.intersects(wgt::Features::MESH_SHADER) {
+            <span class="kw">if </span>requested_features.intersects(wgt::Features::EXPERIMENTAL_MESH_SHADER) {
                 extensions.push(khr::maintenance4::NAME);
             }
         }
@@ -3741,7 +3755,7 @@
             extensions.push(google::display_timing::NAME);
         }
 
-        <span class="kw">if </span>requested_features.contains(wgt::Features::MESH_SHADER) {
+        <span class="kw">if </span>requested_features.contains(wgt::Features::EXPERIMENTAL_MESH_SHADER) {
             extensions.push(ext::mesh_shader::NAME);
         }
 

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

@@ -1525,7 +1525,20 @@
 <a href="#1524" id="1524">1524</a>
 <a href="#1525" id="1525">1525</a>
 <a href="#1526" id="1526">1526</a>
-<a href="#1527" id="1527">1527</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">crate</span>::VertexFormat;
+<a href="#1527" id="1527">1527</a>
+<a href="#1528" id="1528">1528</a>
+<a href="#1529" id="1529">1529</a>
+<a href="#1530" id="1530">1530</a>
+<a href="#1531" id="1531">1531</a>
+<a href="#1532" id="1532">1532</a>
+<a href="#1533" id="1533">1533</a>
+<a href="#1534" id="1534">1534</a>
+<a href="#1535" id="1535">1535</a>
+<a href="#1536" id="1536">1536</a>
+<a href="#1537" id="1537">1537</a>
+<a href="#1538" id="1538">1538</a>
+<a href="#1539" id="1539">1539</a>
+<a href="#1540" id="1540">1540</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;
@@ -2691,7 +2704,8 @@
         /// - Metal
         ///
         /// This is a native only feature.
-        </span><span class="kw">const </span>MESH_SHADER = <span class="number">1 </span>&lt;&lt; <span class="number">47</span>;
+        </span><span class="kw">const </span>EXPERIMENTAL_MESH_SHADER = <span class="number">1 </span>&lt;&lt; <span class="number">47</span>;
+
         <span class="doccomment">/// ***THIS IS EXPERIMENTAL:*** Features enabled by this may have
         /// major bugs in them and are expected to be subject to breaking changes, suggestions
         /// for the API exposed by this should be posted on [the ray-tracing issue](https://github.com/gfx-rs/wgpu/issues/6762)
@@ -2706,6 +2720,18 @@
         ///
         /// [`AccelerationStructureFlags::ALLOW_RAY_HIT_VERTEX_RETURN`]: super::AccelerationStructureFlags::ALLOW_RAY_HIT_VERTEX_RETURN
         </span><span class="kw">const </span>EXPERIMENTAL_RAY_HIT_VERTEX_RETURN = <span class="number">1 </span>&lt;&lt; <span class="number">48</span>;
+
+        <span class="doccomment">/// Enables multiview in mesh shader pipelines
+        ///
+        /// Supported platforms:
+        /// - Vulkan (with [VK_EXT_mesh_shader](https://registry.khronos.org/vulkan/specs/latest/man/html/VK_EXT_mesh_shader.html))
+        ///
+        /// Potential Platforms:
+        /// - DX12
+        /// - Metal
+        ///
+        /// 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">/// Features that are not guaranteed to be supported.

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

@@ -32,4 +32,4 @@
 ) -&gt; <a class="enum" href="https://doc.rust-lang.org/1.85.0/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="struct.SurfaceCapabilities.html" title="struct wgpu_hal::SurfaceCapabilities">SurfaceCapabilities</a>&gt;</h4></section></summary><div class="docblock"><p>Returns the capabilities of working with a specified surface.</p>
 <p><code>None</code> means presentation is not supported for it.</p>
 </div></details><details class="toggle method-toggle" open><summary><section id="tymethod.get_presentation_timestamp" class="method"><a class="src rightside" href="../src/wgpu_hal/lib.rs.html#656">Source</a><h4 class="code-header">unsafe fn <a href="#tymethod.get_presentation_timestamp" class="fn">get_presentation_timestamp</a>(&amp;self) -&gt; <a class="struct" href="../wgpu_types/struct.PresentationTimestamp.html" title="struct wgpu_types::PresentationTimestamp">PresentationTimestamp</a></h4></section></summary><div class="docblock"><p>Creates a <a href="../wgpu_types/struct.PresentationTimestamp.html" title="struct wgpu_types::PresentationTimestamp"><code>PresentationTimestamp</code></a> using the adapter’s WSI.</p>
-</div></details></div><h2 id="implementors" class="section-header">Implementors<a href="#implementors" class="anchor">§</a></h2><div id="implementors-list"><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Adapter" class="impl"><a class="src rightside" href="../src/wgpu_hal/gles/adapter.rs.html#952-1233">Source</a><a href="#impl-Adapter-for-Adapter" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for wgpu_hal::gles::<a class="struct" href="gles/struct.Adapter.html" title="struct wgpu_hal::gles::Adapter">Adapter</a></h3><span class="item-info"><div class="stab portability">Available on <strong><code>gles</code></strong> only.</div></span></section></summary><div class="impl-items"><section id="associatedtype.A-1" class="associatedtype trait-impl"><a class="src rightside" href="../src/wgpu_hal/gles/adapter.rs.html#953">Source</a><a href="#associatedtype.A-1" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="gles/struct.Api.html" title="struct wgpu_hal::gles::Api">Api</a></h4></section></div></details><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Context" class="impl"><a class="src rightside" href="../src/wgpu_hal/noop/mod.rs.html#219-247">Source</a><a href="#impl-Adapter-for-Context" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for <a class="struct" href="noop/struct.Context.html" title="struct wgpu_hal::noop::Context">Context</a></h3></section></summary><div class="impl-items"><section id="associatedtype.A-2" class="associatedtype trait-impl"><a class="src rightside" href="../src/wgpu_hal/noop/mod.rs.html#220">Source</a><a href="#associatedtype.A-2" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="noop/struct.Api.html" title="struct wgpu_hal::noop::Api">Api</a></h4></section></div></details><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Adapter-1" class="impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/adapter.rs.html#2201-2520">Source</a><a href="#impl-Adapter-for-Adapter-1" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for wgpu_hal::vulkan::<a class="struct" href="vulkan/struct.Adapter.html" title="struct wgpu_hal::vulkan::Adapter">Adapter</a></h3><span class="item-info"><div class="stab portability">Available on <strong><code>vulkan</code></strong> only.</div></span></section></summary><div class="impl-items"><section id="associatedtype.A-3" class="associatedtype trait-impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/adapter.rs.html#2202">Source</a><a href="#associatedtype.A-3" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="vulkan/struct.Api.html" title="struct wgpu_hal::vulkan::Api">Api</a></h4></section></div></details></div><script src="../trait.impl/wgpu_hal/trait.Adapter.js" async></script></section></div></main></body></html>
+</div></details></div><h2 id="implementors" class="section-header">Implementors<a href="#implementors" class="anchor">§</a></h2><div id="implementors-list"><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Adapter" class="impl"><a class="src rightside" href="../src/wgpu_hal/gles/adapter.rs.html#952-1233">Source</a><a href="#impl-Adapter-for-Adapter" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for wgpu_hal::gles::<a class="struct" href="gles/struct.Adapter.html" title="struct wgpu_hal::gles::Adapter">Adapter</a></h3><span class="item-info"><div class="stab portability">Available on <strong><code>gles</code></strong> only.</div></span></section></summary><div class="impl-items"><section id="associatedtype.A-1" class="associatedtype trait-impl"><a class="src rightside" href="../src/wgpu_hal/gles/adapter.rs.html#953">Source</a><a href="#associatedtype.A-1" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="gles/struct.Api.html" title="struct wgpu_hal::gles::Api">Api</a></h4></section></div></details><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Context" class="impl"><a class="src rightside" href="../src/wgpu_hal/noop/mod.rs.html#219-247">Source</a><a href="#impl-Adapter-for-Context" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for <a class="struct" href="noop/struct.Context.html" title="struct wgpu_hal::noop::Context">Context</a></h3></section></summary><div class="impl-items"><section id="associatedtype.A-2" class="associatedtype trait-impl"><a class="src rightside" href="../src/wgpu_hal/noop/mod.rs.html#220">Source</a><a href="#associatedtype.A-2" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="noop/struct.Api.html" title="struct wgpu_hal::noop::Api">Api</a></h4></section></div></details><details class="toggle implementors-toggle"><summary><section id="impl-Adapter-for-Adapter-1" class="impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/adapter.rs.html#2208-2527">Source</a><a href="#impl-Adapter-for-Adapter-1" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Adapter.html" title="trait wgpu_hal::Adapter">Adapter</a> for wgpu_hal::vulkan::<a class="struct" href="vulkan/struct.Adapter.html" title="struct wgpu_hal::vulkan::Adapter">Adapter</a></h3><span class="item-info"><div class="stab portability">Available on <strong><code>vulkan</code></strong> only.</div></span></section></summary><div class="impl-items"><section id="associatedtype.A-3" class="associatedtype trait-impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/adapter.rs.html#2209">Source</a><a href="#associatedtype.A-3" class="anchor">§</a><h4 class="code-header">type <a href="#associatedtype.A" class="associatedtype">A</a> = <a class="struct" href="vulkan/struct.Api.html" title="struct wgpu_hal::vulkan::Api">Api</a></h4></section></div></details></div><script src="../trait.impl/wgpu_hal/trait.Adapter.js" async></script></section></div></main></body></html>