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

Author: Wumpf

doc/src/wgpu_core/instance.rs.html

@@ -980,11 +980,36 @@
 <a href="#979" id="979">979</a>
 <a href="#980" id="980">980</a>
 <a href="#981" id="981">981</a>
+<a href="#982" id="982">982</a>
+<a href="#983" id="983">983</a>
+<a href="#984" id="984">984</a>
+<a href="#985" id="985">985</a>
+<a href="#986" id="986">986</a>
+<a href="#987" id="987">987</a>
+<a href="#988" id="988">988</a>
+<a href="#989" id="989">989</a>
+<a href="#990" id="990">990</a>
+<a href="#991" id="991">991</a>
+<a href="#992" id="992">992</a>
+<a href="#993" id="993">993</a>
+<a href="#994" id="994">994</a>
+<a href="#995" id="995">995</a>
+<a href="#996" id="996">996</a>
+<a href="#997" id="997">997</a>
+<a href="#998" id="998">998</a>
+<a href="#999" id="999">999</a>
+<a href="#1000" id="1000">1000</a>
+<a href="#1001" id="1001">1001</a>
+<a href="#1002" id="1002">1002</a>
+<a href="#1003" id="1003">1003</a>
+<a href="#1004" id="1004">1004</a>
+<a href="#1005" id="1005">1005</a>
+<a href="#1006" id="1006">1006</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>std::sync::Arc;
 <span class="kw">use </span>std::{borrow::Cow, collections::HashMap};
 
 <span class="kw">use crate</span>::{
-    api_log,
+    api_log, api_log_debug,
     device::{queue::Queue, resource::Device, DeviceDescriptor, DeviceError},
     global::Global,
     hal_api::HalApi,
@@ -1287,7 +1312,7 @@
             <span class="kw">let </span>hal_adapters = <span class="kw">unsafe </span>{ instance.enumerate_adapters(<span class="prelude-val">None</span>) };
             <span class="kw">for </span>raw <span class="kw">in </span>hal_adapters {
                 <span class="kw">let </span>adapter = Adapter::new(raw);
-                <span class="macro">log::info!</span>(<span class="string">"Adapter {:?}"</span>, adapter.raw.info);
+                <span class="macro">api_log_debug!</span>(<span class="string">"Adapter {:?}"</span>, adapter.raw.info);
                 adapters.push(adapter);
             }
         }
@@ -1318,8 +1343,19 @@
                 backend_adapters.retain(|exposed| exposed.info.device_type == wgt::DeviceType::Cpu);
             }
             <span class="kw">if let </span><span class="prelude-val">Some</span>(surface) = desc.compatible_surface {
-                backend_adapters
-                    .retain(|exposed| surface.get_capabilities_with_raw(exposed).is_ok());
+                backend_adapters.retain(|exposed| {
+                    <span class="kw">let </span>capabilities = surface.get_capabilities_with_raw(exposed);
+                    <span class="kw">if let </span><span class="prelude-val">Err</span>(err) = capabilities {
+                        <span class="macro">log::debug!</span>(
+                            <span class="string">"Adapter {:?} not compatible with surface: {}"</span>,
+                            exposed.info,
+                            err
+                        );
+                        <span class="bool-val">false
+                    </span>} <span class="kw">else </span>{
+                        <span class="bool-val">true
+                    </span>}
+                });
             }
             adapters.extend(backend_adapters);
         }
@@ -1360,8 +1396,22 @@
             }
         }
 
+        <span class="comment">// `request_adapter` can be a bit of a black box.
+        // Shine some light on its decision in debug log.
+        </span><span class="kw">if </span>adapters.is_empty() {
+            <span class="macro">log::debug!</span>(<span class="string">"Request adapter didn't find compatible adapters."</span>);
+        } <span class="kw">else </span>{
+            <span class="macro">log::debug!</span>(
+                <span class="string">"Found {} compatible adapters. Sorted by preference:"</span>,
+                adapters.len()
+            );
+            <span class="kw">for </span>adapter <span class="kw">in </span><span class="kw-2">&amp;</span>adapters {
+                <span class="macro">log::debug!</span>(<span class="string">"* {:?}"</span>, adapter.info);
+            }
+        }
+
         <span class="kw">if let </span><span class="prelude-val">Some</span>(adapter) = adapters.into_iter().next() {
-            <span class="macro">log::info!</span>(<span class="string">"Adapter {:?}"</span>, adapter.info);
+            <span class="macro">api_log_debug!</span>(<span class="string">"Request adapter result {:?}"</span>, adapter.info);
             <span class="kw">let </span>adapter = Adapter::new(adapter);
             <span class="prelude-val">Ok</span>(adapter)
         } <span class="kw">else </span>{

doc/src/wgpu_core/lib.rs.html

@@ -213,6 +213,17 @@
 <a href="#212" id="212">212</a>
 <a href="#213" id="213">213</a>
 <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>
+<a href="#218" id="218">218</a>
+<a href="#219" id="219">219</a>
+<a href="#220" id="220">220</a>
+<a href="#221" id="221">221</a>
+<a href="#222" id="222">222</a>
+<a href="#223" id="223">223</a>
+<a href="#224" id="224">224</a>
+<a href="#225" id="225">225</a>
 </pre></div><pre class="rust"><code><span class="doccomment">//! This library safely implements WebGPU on native platforms.
 //! It is designed for integration into browsers, as well as wrapping
 //! into other language-specific user-friendly libraries.
@@ -377,7 +388,18 @@
 </span><span class="macro">macro_rules! </span>api_log {
     ($(<span class="macro-nonterminal">$arg</span>:tt)+) =&gt; (<span class="macro">log::trace!</span>($(<span class="macro-nonterminal">$arg</span>)+))
 }
+
+<span class="attr">#[cfg(feature = <span class="string">"api_log_info"</span>)]
+</span><span class="macro">macro_rules! </span>api_log_debug {
+    ($(<span class="macro-nonterminal">$arg</span>:tt)+) =&gt; (<span class="macro">log::info!</span>($(<span class="macro-nonterminal">$arg</span>)+))
+}
+<span class="attr">#[cfg(not(feature = <span class="string">"api_log_info"</span>))]
+</span><span class="macro">macro_rules! </span>api_log_debug {
+    ($(<span class="macro-nonterminal">$arg</span>:tt)+) =&gt; (<span class="macro">log::debug!</span>($(<span class="macro-nonterminal">$arg</span>)+))
+}
+
 <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">use </span>api_log;
+<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">use </span>api_log_debug;
 
 <span class="attr">#[cfg(feature = <span class="string">"resource_log_info"</span>)]
 </span><span class="macro">macro_rules! </span>resource_log {

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

@@ -1463,11 +1463,11 @@
                     callback_data: debug_utils_create_info.callback_data,
                 })
             } <span class="kw">else </span>{
-                <span class="macro">log::info!</span>(<span class="string">"Debug utils not enabled: extension not listed"</span>);
+                <span class="macro">log::debug!</span>(<span class="string">"Debug utils not enabled: extension not listed"</span>);
                 <span class="prelude-val">None
             </span>}
         } <span class="kw">else </span>{
-            <span class="macro">log::info!</span>(
+            <span class="macro">log::debug!</span>(
                 <span class="string">"Debug utils not enabled: \
                         debug_utils_user_data not passed to Instance::from_raw"
             </span>);

doc/src/wgpu_types/lib.rs.html

@@ -7797,6 +7797,7 @@
 <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>
 </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.
 
@@ -7979,6 +7980,7 @@
     </span><span class="kw">pub </span>force_fallback_adapter: bool,
     <span class="doccomment">/// Surface that is required to be presentable with the requested adapter. This does not
     /// create the surface, only guarantees that the adapter can present to said surface.
+    /// For WebGL, this is strictly required, as an adapter can not be created without a surface.
     </span><span class="kw">pub </span>compatible_surface: <span class="prelude-ty">Option</span>&lt;S&gt;,
 }