Deploying to master from @ gfx-rs/wgpu@0d61648 🚀

Author: cwfitzgerald

doc/search-index.js

@@ -2779,8 +2779,33 @@
 <a href="#2778" id="2778">2778</a>
 <a href="#2779" id="2779">2779</a>
 <a href="#2780" id="2780">2780</a>
-<a href="#2781" id="2781">2781</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;
+<a href="#2781" id="2781">2781</a>
+<a href="#2782" id="2782">2782</a>
+<a href="#2783" id="2783">2783</a>
+<a href="#2784" id="2784">2784</a>
+<a href="#2785" id="2785">2785</a>
+<a href="#2786" id="2786">2786</a>
+<a href="#2787" id="2787">2787</a>
+<a href="#2788" id="2788">2788</a>
+<a href="#2789" id="2789">2789</a>
+<a href="#2790" id="2790">2790</a>
+<a href="#2791" id="2791">2791</a>
+<a href="#2792" id="2792">2792</a>
+<a href="#2793" id="2793">2793</a>
+<a href="#2794" id="2794">2794</a>
+<a href="#2795" id="2795">2795</a>
+<a href="#2796" id="2796">2796</a>
+<a href="#2797" id="2797">2797</a>
+<a href="#2798" id="2798">2798</a>
+<a href="#2799" id="2799">2799</a>
+<a href="#2800" id="2800">2800</a>
+<a href="#2801" id="2801">2801</a>
+<a href="#2802" id="2802">2802</a>
+<a href="#2803" id="2803">2803</a>
+<a href="#2804" id="2804">2804</a>
+<a href="#2805" id="2805">2805</a>
+<a href="#2806" id="2806">2806</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{borrow::ToOwned <span class="kw">as _</span>, boxed::Box, collections::BTreeMap, sync::Arc, vec::Vec};
+<span class="kw">use </span>core::{ffi::CStr, marker::PhantomData};
 
 <span class="kw">use </span>ash::{ext, google, khr, vk};
 <span class="kw">use </span>parking_lot::Mutex;
@@ -5068,25 +5093,37 @@
     <span class="kw">pub fn </span>texture_format_as_raw(<span class="kw-2">&amp;</span><span class="self">self</span>, texture_format: wgt::TextureFormat) -&gt; vk::Format {
         <span class="self">self</span>.private_caps.map_texture_format(texture_format)
     }
-}
-
-<span class="kw">impl </span><span class="kw">crate</span>::Adapter <span class="kw">for </span><span class="kw">super</span>::Adapter {
-    <span class="kw">type </span>A = <span class="kw">super</span>::Api;
 
-    <span class="kw">unsafe fn </span>open(
+    <span class="doccomment">/// # Safety:
+    /// - Same as `open` plus
+    /// - The callback may not change anything that the device does not support.
+    /// - The callback may not remove features.
+    </span><span class="kw">pub unsafe fn </span>open_with_callback&lt;<span class="lifetime">'a</span>&gt;(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
         features: wgt::Features,
-        _limits: <span class="kw-2">&amp;</span>wgt::Limits,
         memory_hints: <span class="kw-2">&amp;</span>wgt::MemoryHints,
+        callback: <span class="prelude-ty">Option</span>&lt;Box&lt;<span class="kw">super</span>::CreateDeviceCallback&lt;<span class="lifetime">'a</span>&gt;&gt;&gt;,
     ) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw">crate</span>::OpenDevice&lt;<span class="kw">super</span>::Api&gt;, <span class="kw">crate</span>::DeviceError&gt; {
-        <span class="kw">let </span>enabled_extensions = <span class="self">self</span>.required_device_extensions(features);
+        <span class="kw">let </span><span class="kw-2">mut </span>enabled_extensions = <span class="self">self</span>.required_device_extensions(features);
         <span class="kw">let </span><span class="kw-2">mut </span>enabled_phd_features = <span class="self">self</span>.physical_device_features(<span class="kw-2">&amp;</span>enabled_extensions, features);
 
         <span class="kw">let </span>family_index = <span class="number">0</span>; <span class="comment">//TODO
         </span><span class="kw">let </span>family_info = vk::DeviceQueueCreateInfo::default()
             .queue_family_index(family_index)
             .queue_priorities(<span class="kw-2">&amp;</span>[<span class="number">1.0</span>]);
-        <span class="kw">let </span>family_infos = [family_info];
+        <span class="kw">let </span><span class="kw-2">mut </span>family_infos = Vec::from([family_info]);
+
+        <span class="kw">let </span><span class="kw-2">mut </span>pre_info = vk::DeviceCreateInfo::default();
+
+        <span class="kw">if let </span><span class="prelude-val">Some</span>(callback) = callback {
+            callback(<span class="kw">super</span>::CreateDeviceCallbackArgs {
+                extensions: <span class="kw-2">&amp;mut </span>enabled_extensions,
+                device_features: <span class="kw-2">&amp;mut </span>enabled_phd_features,
+                queue_create_infos: <span class="kw-2">&amp;mut </span>family_infos,
+                create_info: <span class="kw-2">&amp;mut </span>pre_info,
+                _phantom: PhantomData,
+            })
+        }
 
         <span class="kw">let </span>str_pointers = enabled_extensions
             .iter()
@@ -5096,7 +5133,7 @@
             })
             .collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
 
-        <span class="kw">let </span>pre_info = vk::DeviceCreateInfo::default()
+        <span class="kw">let </span>pre_info = pre_info
             .queue_create_infos(<span class="kw-2">&amp;</span>family_infos)
             .enabled_extension_names(<span class="kw-2">&amp;</span>str_pointers);
         <span class="kw">let </span>info = enabled_phd_features.add_to_device_create(pre_info);
@@ -5132,6 +5169,19 @@
             )
         }
     }
+}
+
+<span class="kw">impl </span><span class="kw">crate</span>::Adapter <span class="kw">for </span><span class="kw">super</span>::Adapter {
+    <span class="kw">type </span>A = <span class="kw">super</span>::Api;
+
+    <span class="kw">unsafe fn </span>open(
+        <span class="kw-2">&amp;</span><span class="self">self</span>,
+        features: wgt::Features,
+        _limits: <span class="kw-2">&amp;</span>wgt::Limits,
+        memory_hints: <span class="kw-2">&amp;</span>wgt::MemoryHints,
+    ) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw">crate</span>::OpenDevice&lt;<span class="kw">super</span>::Api&gt;, <span class="kw">crate</span>::DeviceError&gt; {
+        <span class="kw">unsafe </span>{ <span class="self">self</span>.open_with_callback(features, memory_hints, <span class="prelude-val">None</span>) }
+    }
 
     <span class="kw">unsafe fn </span>texture_format_capabilities(
         <span class="kw-2">&amp;</span><span class="self">self</span>,

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

@@ -1137,9 +1137,36 @@
 <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></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{borrow::ToOwned <span class="kw">as _</span>, boxed::Box, ffi::CString, string::String, sync::Arc, vec::Vec};
+<a href="#1139" id="1139">1139</a>
+<a href="#1140" id="1140">1140</a>
+<a href="#1141" id="1141">1141</a>
+<a href="#1142" id="1142">1142</a>
+<a href="#1143" id="1143">1143</a>
+<a href="#1144" id="1144">1144</a>
+<a href="#1145" id="1145">1145</a>
+<a href="#1146" id="1146">1146</a>
+<a href="#1147" id="1147">1147</a>
+<a href="#1148" id="1148">1148</a>
+<a href="#1149" id="1149">1149</a>
+<a href="#1150" id="1150">1150</a>
+<a href="#1151" id="1151">1151</a>
+<a href="#1152" id="1152">1152</a>
+<a href="#1153" id="1153">1153</a>
+<a href="#1154" id="1154">1154</a>
+<a href="#1155" id="1155">1155</a>
+<a href="#1156" id="1156">1156</a>
+<a href="#1157" id="1157">1157</a>
+<a href="#1158" id="1158">1158</a>
+<a href="#1159" id="1159">1159</a>
+<a href="#1160" id="1160">1160</a>
+<a href="#1161" id="1161">1161</a>
+<a href="#1162" id="1162">1162</a>
+<a href="#1163" id="1163">1163</a>
+<a href="#1164" id="1164">1164</a>
+<a href="#1165" id="1165">1165</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{borrow::ToOwned <span class="kw">as _</span>, boxed::Box, ffi::CString, string::String, sync::Arc, vec::Vec};
 <span class="kw">use </span>core::{
     ffi::{c_void, CStr},
+    marker::PhantomData,
     slice,
     str::FromStr,
 };
@@ -1724,27 +1751,19 @@
             swapchain: RwLock::new(<span class="prelude-val">None</span>),
         }
     }
-}
-
-<span class="kw">impl </span>Drop <span class="kw">for </span><span class="kw">super</span>::InstanceShared {
-    <span class="kw">fn </span>drop(<span class="kw-2">&amp;mut </span><span class="self">self</span>) {
-        <span class="kw">unsafe </span>{
-            <span class="comment">// Keep du alive since destroy_instance may also log
-            </span><span class="kw">let </span>_du = <span class="self">self</span>.debug_utils.take().inspect(|du| {
-                du.extension
-                    .destroy_debug_utils_messenger(du.messenger, <span class="prelude-val">None</span>);
-            });
-            <span class="kw">if </span><span class="self">self</span>.drop_guard.is_none() {
-                <span class="self">self</span>.raw.destroy_instance(<span class="prelude-val">None</span>);
-            }
-        }
-    }
-}
-
-<span class="kw">impl </span><span class="kw">crate</span>::Instance <span class="kw">for </span><span class="kw">super</span>::Instance {
-    <span class="kw">type </span>A = <span class="kw">super</span>::Api;
 
-    <span class="kw">unsafe fn </span>init(desc: <span class="kw-2">&amp;</span><span class="kw">crate</span>::InstanceDescriptor) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>, <span class="kw">crate</span>::InstanceError&gt; {
+    <span class="doccomment">/// `Instance::init` but with a callback.
+    /// If you want to add extensions, add the to the `Vec&lt;'static CStr&gt;` not the create info, otherwise
+    /// it will be overwritten
+    ///
+    /// # Safety:
+    /// Same as `init` but additionally
+    /// - Callback must not remove features.
+    /// - Callback must not change anything to what the instance does not support.
+    </span><span class="kw">pub unsafe fn </span>init_with_callback(
+        desc: <span class="kw-2">&amp;</span><span class="kw">crate</span>::InstanceDescriptor,
+        callback: <span class="prelude-ty">Option</span>&lt;Box&lt;<span class="kw">super</span>::CreateInstanceCallback&gt;&gt;,
+    ) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>, <span class="kw">crate</span>::InstanceError&gt; {
         <span class="macro">profiling::scope!</span>(<span class="string">"Init Vulkan Backend"</span>);
 
         <span class="kw">let </span>entry = <span class="kw">unsafe </span>{
@@ -1793,7 +1812,17 @@
                 },
             );
 
-        <span class="kw">let </span>extensions = <span class="self">Self</span>::desired_extensions(<span class="kw-2">&amp;</span>entry, instance_api_version, desc.flags)<span class="question-mark">?</span>;
+        <span class="kw">let </span><span class="kw-2">mut </span>extensions = <span class="self">Self</span>::desired_extensions(<span class="kw-2">&amp;</span>entry, instance_api_version, desc.flags)<span class="question-mark">?</span>;
+        <span class="kw">let </span><span class="kw-2">mut </span>create_info = vk::InstanceCreateInfo::default();
+
+        <span class="kw">if let </span><span class="prelude-val">Some</span>(callback) = callback {
+            callback(<span class="kw">super</span>::CreateInstanceCallbackArgs {
+                extensions: <span class="kw-2">&amp;mut </span>extensions,
+                create_info: <span class="kw-2">&amp;mut </span>create_info,
+                entry: <span class="kw-2">&amp;</span>entry,
+                _phantom: PhantomData,
+            });
+        }
 
         <span class="kw">let </span>instance_layers = {
             <span class="macro">profiling::scope!</span>(<span class="string">"vkEnumerateInstanceLayerProperties"</span>);
@@ -1953,7 +1982,7 @@
                 })
                 .collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
 
-            <span class="kw">let </span><span class="kw-2">mut </span>create_info = vk::InstanceCreateInfo::default()
+            create_info = create_info
                 .flags(flags)
                 .application_info(<span class="kw-2">&amp;</span>app_info)
                 .enabled_layer_names(<span class="kw-2">&amp;</span>str_pointers[..layers.len()])
@@ -2015,6 +2044,29 @@
             )
         }
     }
+}
+
+<span class="kw">impl </span>Drop <span class="kw">for </span><span class="kw">super</span>::InstanceShared {
+    <span class="kw">fn </span>drop(<span class="kw-2">&amp;mut </span><span class="self">self</span>) {
+        <span class="kw">unsafe </span>{
+            <span class="comment">// Keep du alive since destroy_instance may also log
+            </span><span class="kw">let </span>_du = <span class="self">self</span>.debug_utils.take().inspect(|du| {
+                du.extension
+                    .destroy_debug_utils_messenger(du.messenger, <span class="prelude-val">None</span>);
+            });
+            <span class="kw">if </span><span class="self">self</span>.drop_guard.is_none() {
+                <span class="self">self</span>.raw.destroy_instance(<span class="prelude-val">None</span>);
+            }
+        }
+    }
+}
+
+<span class="kw">impl </span><span class="kw">crate</span>::Instance <span class="kw">for </span><span class="kw">super</span>::Instance {
+    <span class="kw">type </span>A = <span class="kw">super</span>::Api;
+
+    <span class="kw">unsafe fn </span>init(desc: <span class="kw-2">&amp;</span><span class="kw">crate</span>::InstanceDescriptor) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="self">Self</span>, <span class="kw">crate</span>::InstanceError&gt; {
+        <span class="kw">unsafe </span>{ <span class="self">Self</span>::init_with_callback(desc, <span class="prelude-val">None</span>) }
+    }
 
     <span class="kw">unsafe fn </span>create_surface(
         <span class="kw-2">&amp;</span><span class="self">self</span>,