Deploying to master from @ f7526ae9604a91d14e58eea0d6342988b4a94e79 🚀

Author: cwfitzgerald

doc/src/wgpu/backend/direct.rs.html

@@ -3291,7 +3291,7 @@
 
     <span class="kw">fn</span> <span class="ident">instance_create_surface</span>(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
-        <span class="ident">handle</span>: <span class="kw-2">&amp;</span><span class="kw">impl</span> <span class="ident">raw_window_handle::HasRawWindowHandle</span>,
+        <span class="ident">handle</span>: <span class="kw-2">&amp;</span>(<span class="kw">impl</span> <span class="ident">raw_window_handle::HasRawWindowHandle</span> <span class="op">+</span> <span class="ident">raw_window_handle::HasRawDisplayHandle</span>),
     ) -&gt; <span class="ident"><span class="self">Self</span>::SurfaceId</span> {
         <span class="ident">Surface</span> {
             <span class="ident">id</span>: <span class="self">self</span>.<span class="number">0</span>.<span class="ident">instance_create_surface</span>(<span class="ident">handle</span>, <span class="ident">PhantomData</span>),

doc/src/wgpu/lib.rs.html

@@ -3667,6 +3667,8 @@
 <span id="3665">3665</span>
 <span id="3666">3666</span>
 <span id="3667">3667</span>
+<span id="3668">3668</span>
+<span id="3669">3669</span>
 </pre><pre class="rust"><code><span class="doccomment">//! A cross-platform graphics and compute library based on [WebGPU](https://gpuweb.github.io/gpuweb/).</span>
 <span class="doccomment">//!</span>
 <span class="doccomment">//! To start using the API, create an [`Instance`].</span>
@@ -3866,7 +3868,7 @@
     <span class="kw">fn</span> <span class="ident">init</span>(<span class="ident">backends</span>: <span class="ident">Backends</span>) -&gt; <span class="self">Self</span>;
     <span class="kw">fn</span> <span class="ident">instance_create_surface</span>(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
-        <span class="ident">handle</span>: <span class="kw-2">&amp;</span><span class="kw">impl</span> <span class="ident">raw_window_handle::HasRawWindowHandle</span>,
+        <span class="ident">handle</span>: <span class="kw-2">&amp;</span>(<span class="kw">impl</span> <span class="ident">raw_window_handle::HasRawWindowHandle</span> <span class="op">+</span> <span class="ident">raw_window_handle::HasRawDisplayHandle</span>),
     ) -&gt; <span class="ident"><span class="self">Self</span>::SurfaceId</span>;
     <span class="kw">fn</span> <span class="ident">instance_request_adapter</span>(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
@@ -5424,7 +5426,9 @@
     <span class="doccomment">/// - Raw Window Handle must be a valid object to create a surface upon and</span>
     <span class="doccomment">///   must remain valid for the lifetime of the returned surface.</span>
     <span class="doccomment">/// - If not called on the main thread, metal backend will panic.</span>
-    <span class="kw">pub</span> <span class="kw">unsafe</span> <span class="kw">fn</span> <span class="ident">create_surface</span><span class="op">&lt;</span><span class="ident">W</span>: <span class="ident">raw_window_handle::HasRawWindowHandle</span><span class="op">&gt;</span>(
+    <span class="kw">pub</span> <span class="kw">unsafe</span> <span class="kw">fn</span> <span class="ident">create_surface</span><span class="op">&lt;</span>
+        <span class="ident">W</span>: <span class="ident">raw_window_handle::HasRawWindowHandle</span> <span class="op">+</span> <span class="ident">raw_window_handle::HasRawDisplayHandle</span>,
+    <span class="op">&gt;</span>(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
         <span class="ident">window</span>: <span class="kw-2">&amp;</span><span class="ident">W</span>,
     ) -&gt; <span class="ident">Surface</span> {

doc/src/wgpu_hal/gles/egl.rs.html

@@ -1259,9 +1259,11 @@
 <span id="1259">1259</span>
 <span id="1260">1260</span>
 <span id="1261">1261</span>
+<span id="1262">1262</span>
+<span id="1263">1263</span>
 </pre><pre class="rust"><code><span class="kw">use</span> <span class="ident">glow::HasContext</span>;
 <span class="kw">use</span> <span class="ident">parking_lot</span>::{<span class="ident">Mutex</span>, <span class="ident">MutexGuard</span>};
-<span class="kw">use</span> <span class="ident">raw_window_handle</span>::{<span class="ident">HasRawWindowHandle</span>, <span class="ident">RawWindowHandle</span>};
+<span class="kw">use</span> <span class="ident">raw_window_handle</span>::{<span class="ident">HasRawDisplayHandle</span>, <span class="ident">HasRawWindowHandle</span>, <span class="ident">RawWindowHandle</span>};
 
 <span class="kw">use</span> <span class="ident">std</span>::{<span class="ident">ffi</span>, <span class="ident">os::raw</span>, <span class="ident">ptr</span>, <span class="ident">sync::Arc</span>, <span class="ident">time::Duration</span>};
 
@@ -2031,7 +2033,7 @@
     <span class="attribute">#[<span class="ident">cfg_attr</span>(<span class="ident">target_os</span> <span class="op">=</span> <span class="string">&quot;macos&quot;</span>, <span class="ident">allow</span>(<span class="ident">unused</span>, <span class="ident">unused_mut</span>, <span class="ident">unreachable_code</span>))]</span>
     <span class="kw">unsafe</span> <span class="kw">fn</span> <span class="ident">create_surface</span>(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
-        <span class="ident">has_handle</span>: <span class="kw-2">&amp;</span><span class="kw">impl</span> <span class="ident">HasRawWindowHandle</span>,
+        <span class="ident">has_handle</span>: <span class="kw-2">&amp;</span>(<span class="kw">impl</span> <span class="ident">HasRawWindowHandle</span> <span class="op">+</span> <span class="ident">HasRawDisplayHandle</span>),
     ) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="ident">Surface</span>, <span class="ident"><span class="kw">crate</span>::InstanceError</span><span class="op">&gt;</span> {
         <span class="kw">use</span> <span class="ident">raw_window_handle::RawWindowHandle</span> <span class="kw">as</span> <span class="ident">Rwh</span>;
 
@@ -2040,13 +2042,13 @@
         <span class="attribute">#[<span class="ident">cfg_attr</span>(<span class="ident">any</span>(<span class="ident">target_os</span> <span class="op">=</span> <span class="string">&quot;android&quot;</span>, <span class="ident">feature</span> <span class="op">=</span> <span class="string">&quot;emscripten&quot;</span>), <span class="ident">allow</span>(<span class="ident">unused_mut</span>))]</span>
         <span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">inner</span> <span class="op">=</span> <span class="self">self</span>.<span class="ident">inner</span>.<span class="ident">lock</span>();
 
-        <span class="kw">match</span> <span class="ident">raw_window_handle</span> {
-            <span class="ident">Rwh::Xlib</span>(<span class="kw">_</span>) =&gt; {}
-            <span class="ident">Rwh::Xcb</span>(<span class="kw">_</span>) =&gt; {}
-            <span class="ident">Rwh::Win32</span>(<span class="kw">_</span>) =&gt; {}
-            <span class="ident">Rwh::AppKit</span>(<span class="kw">_</span>) =&gt; {}
+        <span class="kw">match</span> (<span class="ident">raw_window_handle</span>, <span class="ident">has_handle</span>.<span class="ident">raw_display_handle</span>()) {
+            (<span class="ident">Rwh::Xlib</span>(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
+            (<span class="ident">Rwh::Xcb</span>(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
+            (<span class="ident">Rwh::Win32</span>(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
+            (<span class="ident">Rwh::AppKit</span>(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
             <span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">target_os</span> <span class="op">=</span> <span class="string">&quot;android&quot;</span>)]</span>
-            <span class="ident">Rwh::AndroidNdk</span>(<span class="ident">handle</span>) =&gt; {
+            (<span class="ident">Rwh::AndroidNdk</span>(<span class="ident">handle</span>), <span class="kw">_</span>) =&gt; {
                 <span class="kw">let</span> <span class="ident">format</span> <span class="op">=</span> <span class="ident">inner</span>
                     .<span class="ident">egl</span>
                     .<span class="ident">instance</span>
@@ -2061,7 +2063,7 @@
                 }
             }
             <span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">feature</span> <span class="op">=</span> <span class="string">&quot;emscripten&quot;</span>))]</span>
-            <span class="ident">Rwh::Wayland</span>(<span class="ident">handle</span>) =&gt; {
+            (<span class="ident">Rwh::Wayland</span>(<span class="kw">_</span>), <span class="ident">raw_window_handle::RawDisplayHandle::Wayland</span>(<span class="ident">display_handle</span>)) =&gt; {
                 <span class="comment">/* Wayland displays are not sharable between surfaces so if the
                  * surface we receive from this handle is from a different
                  * display, we must re-initialize the context.
@@ -2071,19 +2073,20 @@
                 <span class="macro">log::warn!</span>(<span class="string">&quot;Re-initializing Gles context due to Wayland window&quot;</span>);
                 <span class="kw">if</span> <span class="ident">inner</span>
                     .<span class="ident">wl_display</span>
-                    .<span class="ident">map</span>(<span class="op">|</span><span class="ident">ptr</span><span class="op">|</span> <span class="ident">ptr</span> <span class="op">!</span><span class="op">=</span> <span class="ident">handle</span>.<span class="ident">display</span>)
+                    .<span class="ident">map</span>(<span class="op">|</span><span class="ident">ptr</span><span class="op">|</span> <span class="ident">ptr</span> <span class="op">!</span><span class="op">=</span> <span class="ident">display_handle</span>.<span class="ident">display</span>)
                     .<span class="ident">unwrap_or</span>(<span class="bool-val">true</span>)
                 {
                     <span class="kw">use</span> <span class="ident">std::ops::DerefMut</span>;
                     <span class="kw">let</span> <span class="ident">display_attributes</span> <span class="op">=</span> [<span class="ident">egl::ATTRIB_NONE</span>];
+
                     <span class="kw">let</span> <span class="ident">display</span> <span class="op">=</span> <span class="ident">inner</span>
                         .<span class="ident">egl</span>
                         .<span class="ident">instance</span>
                         .<span class="ident">upcast</span>::<span class="op">&lt;</span><span class="ident">egl::EGL1_5</span><span class="op">&gt;</span>()
                         .<span class="ident">unwrap</span>()
                         .<span class="ident">get_platform_display</span>(
                             <span class="ident">EGL_PLATFORM_WAYLAND_KHR</span>,
-                            <span class="ident">handle</span>.<span class="ident">display</span>,
+                            <span class="ident">display_handle</span>.<span class="ident">display</span>,
                             <span class="kw-2">&amp;</span><span class="ident">display_attributes</span>,
                         )
                         .<span class="ident">unwrap</span>();
@@ -2093,12 +2096,13 @@
                             .<span class="ident">map_err</span>(<span class="op">|</span><span class="kw">_</span><span class="op">|</span> <span class="ident"><span class="kw">crate</span>::InstanceError</span>)<span class="question-mark">?</span>;
 
                     <span class="kw">let</span> <span class="ident">old_inner</span> <span class="op">=</span> <span class="ident">std::mem::replace</span>(<span class="ident">inner</span>.<span class="ident">deref_mut</span>(), <span class="ident">new_inner</span>);
-                    <span class="ident">inner</span>.<span class="ident">wl_display</span> <span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">handle</span>.<span class="ident">display</span>);
+                    <span class="ident">inner</span>.<span class="ident">wl_display</span> <span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">display_handle</span>.<span class="ident">display</span>);
+
                     <span class="ident">drop</span>(<span class="ident">old_inner</span>);
                 }
             }
             <span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">feature</span> <span class="op">=</span> <span class="string">&quot;emscripten&quot;</span>)]</span>
-            <span class="ident">Rwh::Web</span>(<span class="kw">_</span>) =&gt; {}
+            (<span class="ident">Rwh::Web</span>(<span class="kw">_</span>), <span class="kw">_</span>) =&gt; {}
             <span class="ident">other</span> =&gt; {
                 <span class="macro">log::error!</span>(<span class="string">&quot;Unsupported window: {:?}&quot;</span>, <span class="ident">other</span>);
                 <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident"><span class="kw">crate</span>::InstanceError</span>);

doc/src/wgpu_hal/lib.rs.html

@@ -1407,7 +1407,7 @@
     <span class="kw">unsafe</span> <span class="kw">fn</span> <span class="ident">init</span>(<span class="ident">desc</span>: <span class="kw-2">&amp;</span><span class="ident">InstanceDescriptor</span>) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="self">Self</span>, <span class="ident">InstanceError</span><span class="op">&gt;</span>;
     <span class="kw">unsafe</span> <span class="kw">fn</span> <span class="ident">create_surface</span>(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
-        <span class="ident">rwh</span>: <span class="kw-2">&amp;</span><span class="kw">impl</span> <span class="ident">raw_window_handle::HasRawWindowHandle</span>,
+        <span class="ident">rwh</span>: <span class="kw-2">&amp;</span>(<span class="kw">impl</span> <span class="ident">raw_window_handle::HasRawWindowHandle</span> <span class="op">+</span> <span class="ident">raw_window_handle::HasRawDisplayHandle</span>),
     ) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="ident">A::Surface</span>, <span class="ident">InstanceError</span><span class="op">&gt;</span>;
     <span class="kw">unsafe</span> <span class="kw">fn</span> <span class="ident">destroy_surface</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">surface</span>: <span class="ident">A::Surface</span>);
     <span class="kw">unsafe</span> <span class="kw">fn</span> <span class="ident">enumerate_adapters</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">ExposedAdapter</span><span class="op">&lt;</span><span class="ident">A</span><span class="op">&gt;</span><span class="op">&gt;</span>;