Deploying to master from @ 8444fbe4606a3cc4b8b2b8237604cf468e8fe254 🚀

Author: cwfitzgerald

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

@@ -1664,15 +1664,6 @@
 <span id="1664">1664</span>
 <span id="1665">1665</span>
 <span id="1666">1666</span>
-<span id="1667">1667</span>
-<span id="1668">1668</span>
-<span id="1669">1669</span>
-<span id="1670">1670</span>
-<span id="1671">1671</span>
-<span id="1672">1672</span>
-<span id="1673">1673</span>
-<span id="1674">1674</span>
-<span id="1675">1675</span>
 </pre><pre class="rust"><code><span class="kw">use</span> <span class="ident"><span class="kw">super</span>::conv</span>;
 
 <span class="kw">use</span> <span class="ident">ash</span>::{<span class="ident">extensions::khr</span>, <span class="ident">vk</span>};
@@ -1690,7 +1681,6 @@
 <span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>, <span class="ident">Default</span>)]</span>
 <span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">PhysicalDeviceFeatures</span> {
     <span class="ident">core</span>: <span class="ident">vk::PhysicalDeviceFeatures</span>,
-    <span class="ident">vulkan_1_1</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">vk::PhysicalDeviceVulkan11Features</span><span class="op">&gt;</span>,
     <span class="kw">pub</span>(<span class="kw">super</span>) <span class="ident">vulkan_1_2</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">vk::PhysicalDeviceVulkan12Features</span><span class="op">&gt;</span>,
     <span class="kw">pub</span>(<span class="kw">super</span>) <span class="ident">descriptor_indexing</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">vk::PhysicalDeviceDescriptorIndexingFeaturesEXT</span><span class="op">&gt;</span>,
     <span class="ident">imageless_framebuffer</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">vk::PhysicalDeviceImagelessFramebufferFeaturesKHR</span><span class="op">&gt;</span>,
@@ -1852,15 +1842,6 @@
                 <span class="comment">//.shader_resource_residency(requested_features.contains(wgt::Features::SHADER_RESOURCE_RESIDENCY))</span>
                 .<span class="ident">geometry_shader</span>(<span class="ident">requested_features</span>.<span class="ident">contains</span>(<span class="ident">wgt::Features::SHADER_PRIMITIVE_INDEX</span>))
                 .<span class="ident">build</span>(),
-            <span class="ident">vulkan_1_1</span>: <span class="kw">if</span> <span class="ident">api_version</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">vk::API_VERSION_1_1</span> {
-                <span class="prelude-val">Some</span>(
-                    <span class="ident">vk::PhysicalDeviceVulkan11Features::builder</span>()
-                        .<span class="ident">multiview</span>(<span class="ident">requested_features</span>.<span class="ident">contains</span>(<span class="ident">wgt::Features::MULTIVIEW</span>))
-                        .<span class="ident">build</span>(),
-                )
-            } <span class="kw">else</span> {
-                <span class="prelude-val">None</span>
-            },
             <span class="ident">vulkan_1_2</span>: <span class="kw">if</span> <span class="ident">api_version</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">vk::API_VERSION_1_2</span> {
                 <span class="prelude-val">Some</span>(
                     <span class="ident">vk::PhysicalDeviceVulkan12Features::builder</span>()
@@ -1991,7 +1972,9 @@
             } <span class="kw">else</span> {
                 <span class="prelude-val">None</span>
             },
-            <span class="ident">multiview</span>: <span class="kw">if</span> <span class="ident">enabled_extensions</span>.<span class="ident">contains</span>(<span class="kw-2">&amp;</span><span class="ident">vk::KhrMultiviewFn::name</span>()) {
+            <span class="ident">multiview</span>: <span class="kw">if</span> <span class="ident">api_version</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">vk::API_VERSION_1_1</span>
+                <span class="op">|</span><span class="op">|</span> <span class="ident">enabled_extensions</span>.<span class="ident">contains</span>(<span class="kw-2">&amp;</span><span class="ident">vk::KhrMultiviewFn::name</span>())
+            {
                 <span class="prelude-val">Some</span>(
                     <span class="ident">vk::PhysicalDeviceMultiviewFeatures::builder</span>()
                         .<span class="ident">multiview</span>(<span class="ident">requested_features</span>.<span class="ident">contains</span>(<span class="ident">wgt::Features::MULTIVIEW</span>))
@@ -2126,10 +2109,6 @@
 
         <span class="kw">let</span> <span class="ident">intel_windows</span> <span class="op">=</span> <span class="ident">caps</span>.<span class="ident">properties</span>.<span class="ident">vendor_id</span> <span class="op">==</span> <span class="ident">db::intel::VENDOR</span> <span class="op">&amp;&amp;</span> <span class="macro">cfg!</span>(<span class="ident">windows</span>);
 
-        <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="kw-2">ref</span> <span class="ident">vulkan_1_1</span>) <span class="op">=</span> <span class="self">self</span>.<span class="ident">vulkan_1_1</span> {
-            <span class="ident">features</span>.<span class="ident">set</span>(<span class="ident">F::MULTIVIEW</span>, <span class="ident">vulkan_1_1</span>.<span class="ident">multiview</span> <span class="op">!</span><span class="op">=</span> <span class="number">0</span>);
-        }
-
         <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="kw-2">ref</span> <span class="ident">vulkan_1_2</span>) <span class="op">=</span> <span class="self">self</span>.<span class="ident">vulkan_1_2</span> {
             <span class="kw">const</span> <span class="ident">STORAGE</span>: <span class="ident">F</span> <span class="op">=</span> <span class="ident">F::STORAGE_RESOURCE_BINDING_ARRAY</span>;
             <span class="kw">if</span> <span class="ident"><span class="self">Self</span>::all_features_supported</span>(
@@ -2566,10 +2545,13 @@
             <span class="kw">let</span> <span class="ident">core</span> <span class="op">=</span> <span class="ident">vk::PhysicalDeviceFeatures::default</span>();
             <span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">builder</span> <span class="op">=</span> <span class="ident">vk::PhysicalDeviceFeatures2KHR::builder</span>().<span class="ident">features</span>(<span class="ident">core</span>);
 
-            <span class="kw">if</span> <span class="ident">capabilities</span>.<span class="ident">properties</span>.<span class="ident">api_version</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">vk::API_VERSION_1_1</span> {
+            <span class="comment">// `VK_KHR_multiview` is promoted to 1.1</span>
+            <span class="kw">if</span> <span class="ident">capabilities</span>.<span class="ident">properties</span>.<span class="ident">api_version</span> <span class="op">&gt;</span><span class="op">=</span> <span class="ident">vk::API_VERSION_1_1</span>
+                <span class="op">|</span><span class="op">|</span> <span class="ident">capabilities</span>.<span class="ident">supports_extension</span>(<span class="ident">vk::KhrMultiviewFn::name</span>())
+            {
                 <span class="kw">let</span> <span class="ident">next</span> <span class="op">=</span> <span class="ident">features</span>
-                    .<span class="ident">vulkan_1_1</span>
-                    .<span class="ident">insert</span>(<span class="ident">vk::PhysicalDeviceVulkan11Features::default</span>());
+                    .<span class="ident">multiview</span>
+                    .<span class="ident">insert</span>(<span class="ident">vk::PhysicalDeviceMultiviewFeatures::default</span>());
                 <span class="ident">builder</span> <span class="op">=</span> <span class="ident">builder</span>.<span class="ident">push_next</span>(<span class="ident">next</span>);
             }