Deploying to master from @ gfx-rs/wgpu@12ce4e2 🚀

Author: ErichDonGubler

doc/src/wgpu_hal/vulkan/drm.rs.html

@@ -145,7 +145,11 @@
 <a href="#144" id="144">144</a>
 <a href="#145" id="145">145</a>
 <a href="#146" id="146">146</a>
-<a href="#147" id="147">147</a></pre></div><pre class="rust"><code><span class="attr">#![cfg(all(unix, not(target_vendor = <span class="string">"apple"</span>), not(target_family = <span class="string">"wasm"</span>)))]
+<a href="#147" id="147">147</a>
+<a href="#148" id="148">148</a>
+<a href="#149" id="149">149</a>
+<a href="#150" id="150">150</a>
+<a href="#151" id="151">151</a></pre></div><pre class="rust"><code><span class="attr">#![cfg(all(unix, not(target_vendor = <span class="string">"apple"</span>), not(target_family = <span class="string">"wasm"</span>)))]
 
 </span><span class="kw">use </span>core::mem::MaybeUninit;
 <span class="kw">use </span>std::{string::ToString, vec::Vec};
@@ -167,9 +171,13 @@
         height: u32,
         refresh_rate: u32,
     ) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw">super</span>::Surface, <span class="kw">crate</span>::InstanceError&gt; {
-        <span class="kw">if </span>!<span class="self">self</span>.shared.extensions.contains(<span class="kw-2">&amp;</span>khr::display::NAME) {
+        <span class="kw">if </span>!<span class="self">self
+            </span>.shared
+            .extensions
+            .contains(<span class="kw-2">&amp;</span>ext::acquire_drm_display::NAME)
+        {
             <span class="kw">return </span><span class="prelude-val">Err</span>(<span class="kw">crate</span>::InstanceError::new(
-                <span class="string">"Vulkan driver does not support VK_KHR_display"</span>.to_string(),
+                <span class="string">"Vulkan driver does not support VK_EXT_acquire_drm_display"</span>.to_string(),
             ));
         }
 

doc/src/wgpu_hal/vulkan/instance.rs.html

@@ -1133,7 +1133,13 @@
 <a href="#1132" id="1132">1132</a>
 <a href="#1133" id="1133">1133</a>
 <a href="#1134" id="1134">1134</a>
-<a href="#1135" id="1135">1135</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{
+<a href="#1135" id="1135">1135</a>
+<a href="#1136" id="1136">1136</a>
+<a href="#1137" id="1137">1137</a>
+<a href="#1138" id="1138">1138</a>
+<a href="#1139" id="1139">1139</a>
+<a href="#1140" id="1140">1140</a>
+<a href="#1141" id="1141">1141</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{
     borrow::ToOwned <span class="kw">as _</span>,
     boxed::Box,
     ffi::{c_void, CStr, CString},
@@ -1392,13 +1398,6 @@
         <span class="comment">// VK_KHR_surface
         </span>extensions.push(khr::surface::NAME);
 
-        <span class="comment">// Extensions needed for drm support
-        </span>extensions.push(khr::display::NAME);
-        extensions.push(ext::physical_device_drm::NAME);
-        extensions.push(khr::get_display_properties2::NAME);
-        extensions.push(ext::direct_mode_display::NAME);
-        extensions.push(ext::acquire_drm_display::NAME);
-
         <span class="comment">// Platform-specific WSI extensions
         </span><span class="kw">if </span><span class="macro">cfg!</span>(all(
             unix,
@@ -1425,6 +1424,19 @@
             </span>extensions.push(ext::metal_surface::NAME);
             extensions.push(khr::portability_enumeration::NAME);
         }
+        <span class="kw">if </span><span class="macro">cfg!</span>(all(
+            unix,
+            not(target_vendor = <span class="string">"apple"</span>),
+            not(target_family = <span class="string">"wasm"</span>)
+        )) {
+            <span class="comment">// VK_EXT_acquire_drm_display -&gt; VK_EXT_direct_mode_display -&gt; VK_KHR_display
+            </span>extensions.push(ext::acquire_drm_display::NAME);
+            extensions.push(ext::direct_mode_display::NAME);
+            extensions.push(khr::display::NAME);
+            <span class="comment">//  VK_EXT_physical_device_drm -&gt; VK_KHR_get_physical_device_properties2
+            </span>extensions.push(ext::physical_device_drm::NAME);
+            extensions.push(khr::get_display_properties2::NAME);
+        }
 
         <span class="kw">if </span>flags.contains(wgt::InstanceFlags::DEBUG) {
             <span class="comment">// VK_EXT_debug_utils

doc/wgpu_hal/trait.Instance.html

@@ -20,4 +20,4 @@
     &self,
     surface_hint: <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;&amp;&lt;Self::<a class="associatedtype" href="trait.Instance.html#associatedtype.A" title="type wgpu_hal::Instance::A">A</a> as <a class="trait" href="trait.Api.html" title="trait wgpu_hal::Api">Api</a>&gt;::<a class="associatedtype" href="trait.Api.html#associatedtype.Surface" title="type wgpu_hal::Api::Surface">Surface</a>&gt;,
 ) -&gt; <a class="struct" href="https://doc.rust-lang.org/1.85.0/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;<a class="struct" href="struct.ExposedAdapter.html" title="struct wgpu_hal::ExposedAdapter">ExposedAdapter</a>&lt;Self::<a class="associatedtype" href="trait.Instance.html#associatedtype.A" title="type wgpu_hal::Instance::A">A</a>&gt;&gt;</h4></section></summary><div class="docblock"><p><code>surface_hint</code> is only used by the GLES backend targeting WebGL2</p>
-</div></details></div><h2 id="dyn-compatibility" class="section-header">Dyn Compatibility<a href="#dyn-compatibility" class="anchor">§</a></h2><div class="dyn-compatibility-info"><p>This trait is <b>not</b> <a href="https://doc.rust-lang.org/1.85.0/reference/items/traits.html#object-safety">dyn compatible</a>.</p><p><i>In older versions of Rust, dyn compatibility was called "object safety", so this trait is not object safe.</i></p></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-Instance-for-Instance" class="impl"><a class="src rightside" href="../src/wgpu_hal/gles/egl.rs.html#788-1126">Source</a><a href="#impl-Instance-for-Instance" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Instance.html" title="trait wgpu_hal::Instance">Instance</a> for wgpu_hal::gles::egl::<a class="struct" href="gles/egl/struct.Instance.html" title="struct wgpu_hal::gles::egl::Instance">Instance</a></h3><span class="item-info"><div class="stab portability">Available on <strong>neither Windows nor <code>webgl</code> and <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/egl.rs.html#789">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-Instance-for-Context" class="impl"><a class="src rightside" href="../src/wgpu_hal/noop/mod.rs.html#86-133">Source</a><a href="#impl-Instance-for-Context" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Instance.html" title="trait wgpu_hal::Instance">Instance</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#87">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-Instance-for-Instance-1" class="impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/instance.rs.html#589-972">Source</a><a href="#impl-Instance-for-Instance-1" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Instance.html" title="trait wgpu_hal::Instance">Instance</a> for wgpu_hal::vulkan::<a class="struct" href="vulkan/struct.Instance.html" title="struct wgpu_hal::vulkan::Instance">Instance</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/instance.rs.html#590">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.Instance.js" async></script></section></div></main></body></html>
+</div></details></div><h2 id="dyn-compatibility" class="section-header">Dyn Compatibility<a href="#dyn-compatibility" class="anchor">§</a></h2><div class="dyn-compatibility-info"><p>This trait is <b>not</b> <a href="https://doc.rust-lang.org/1.85.0/reference/items/traits.html#object-safety">dyn compatible</a>.</p><p><i>In older versions of Rust, dyn compatibility was called "object safety", so this trait is not object safe.</i></p></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-Instance-for-Instance" class="impl"><a class="src rightside" href="../src/wgpu_hal/gles/egl.rs.html#788-1126">Source</a><a href="#impl-Instance-for-Instance" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Instance.html" title="trait wgpu_hal::Instance">Instance</a> for wgpu_hal::gles::egl::<a class="struct" href="gles/egl/struct.Instance.html" title="struct wgpu_hal::gles::egl::Instance">Instance</a></h3><span class="item-info"><div class="stab portability">Available on <strong>neither Windows nor <code>webgl</code> and <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/egl.rs.html#789">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-Instance-for-Context" class="impl"><a class="src rightside" href="../src/wgpu_hal/noop/mod.rs.html#86-133">Source</a><a href="#impl-Instance-for-Context" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Instance.html" title="trait wgpu_hal::Instance">Instance</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#87">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-Instance-for-Instance-1" class="impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/instance.rs.html#595-978">Source</a><a href="#impl-Instance-for-Instance-1" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Instance.html" title="trait wgpu_hal::Instance">Instance</a> for wgpu_hal::vulkan::<a class="struct" href="vulkan/struct.Instance.html" title="struct wgpu_hal::vulkan::Instance">Instance</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/instance.rs.html#596">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.Instance.js" async></script></section></div></main></body></html>

doc/wgpu_hal/trait.Surface.html

@@ -90,4 +90,4 @@ <h5 id="safety-3"><a class="doc-anchor" href="#safety-3">§</a>Safety</h5>
 <a href="trait.Queue.html#tymethod.present" title="method wgpu_hal::Queue::present"><code>Queue::present</code></a>.</p>
 </li>
 </ul>
-</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-Surface-for-Surface" class="impl"><a class="src rightside" href="../src/wgpu_hal/gles/egl.rs.html#1295-1548">Source</a><a href="#impl-Surface-for-Surface" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Surface.html" title="trait wgpu_hal::Surface">Surface</a> for wgpu_hal::gles::egl::<a class="struct" href="gles/egl/struct.Surface.html" title="struct wgpu_hal::gles::egl::Surface">Surface</a></h3><span class="item-info"><div class="stab portability">Available on <strong>neither Windows nor <code>webgl</code> and <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/egl.rs.html#1296">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-Surface-for-Context" class="impl"><a class="src rightside" href="../src/wgpu_hal/noop/mod.rs.html#196-217">Source</a><a href="#impl-Surface-for-Context" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Surface.html" title="trait wgpu_hal::Surface">Surface</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#197">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-Surface-for-Surface-1" class="impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/instance.rs.html#980-1135">Source</a><a href="#impl-Surface-for-Surface-1" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Surface.html" title="trait wgpu_hal::Surface">Surface</a> for wgpu_hal::vulkan::<a class="struct" href="vulkan/struct.Surface.html" title="struct wgpu_hal::vulkan::Surface">Surface</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/instance.rs.html#981">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.Surface.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-Surface-for-Surface" class="impl"><a class="src rightside" href="../src/wgpu_hal/gles/egl.rs.html#1295-1548">Source</a><a href="#impl-Surface-for-Surface" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Surface.html" title="trait wgpu_hal::Surface">Surface</a> for wgpu_hal::gles::egl::<a class="struct" href="gles/egl/struct.Surface.html" title="struct wgpu_hal::gles::egl::Surface">Surface</a></h3><span class="item-info"><div class="stab portability">Available on <strong>neither Windows nor <code>webgl</code> and <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/egl.rs.html#1296">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-Surface-for-Context" class="impl"><a class="src rightside" href="../src/wgpu_hal/noop/mod.rs.html#196-217">Source</a><a href="#impl-Surface-for-Context" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Surface.html" title="trait wgpu_hal::Surface">Surface</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#197">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-Surface-for-Surface-1" class="impl"><a class="src rightside" href="../src/wgpu_hal/vulkan/instance.rs.html#986-1141">Source</a><a href="#impl-Surface-for-Surface-1" class="anchor">§</a><h3 class="code-header">impl <a class="trait" href="trait.Surface.html" title="trait wgpu_hal::Surface">Surface</a> for wgpu_hal::vulkan::<a class="struct" href="vulkan/struct.Surface.html" title="struct wgpu_hal::vulkan::Surface">Surface</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/instance.rs.html#987">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.Surface.js" async></script></section></div></main></body></html>