renderer_vulkan: Improve handling of required vs optional extensions. (#2792)

* renderer_vulkan: Improve handling of required vs optional extensions.

* documents: Update quickstart Vulkan requirements.

documents/Quickstart/Quickstart.md

@@ -29,8 +29,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
 ### GPU
 
 - A graphics card with at least 1GB of VRAM
-- Keep your graphics drivers up to date
+- Up-to-date graphics drivers
-- Vulkan 1.3 support (required)
+- Vulkan 1.3 with the `VK_KHR_swapchain` and `VK_KHR_push_descriptor` extensions
 
 ### RAM
 

src/video_core/renderer_vulkan/vk_instance.cpp

@@ -242,18 +242,21 @@ bool Instance::CreateDevice() {
 
     // These extensions are promoted by Vulkan 1.3, but for greater compatibility we use Vulkan 1.2
     // with extensions.
-    add_extension(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME);
+    ASSERT(add_extension(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME));
-    add_extension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);
+    ASSERT(add_extension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME));
-    add_extension(VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME);
+    ASSERT(add_extension(VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME));
-    add_extension(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME);
+    ASSERT(add_extension(VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME));
-    add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);
+    ASSERT(add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME));
-    add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);
+    ASSERT(add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME));
-    add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
+    ASSERT(add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME));
-    add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
+    ASSERT(add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME));
 
-    add_extension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
+    // Required
-    add_extension(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
+    ASSERT(add_extension(VK_KHR_SWAPCHAIN_EXTENSION_NAME));
-    add_extension(VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME);
+    ASSERT(add_extension(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME));
+
+    // Optional
+    depth_range_unrestricted = add_extension(VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME);
     dynamic_state_3 = add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME);
     if (dynamic_state_3) {
         dynamic_state_3_features =

src/video_core/renderer_vulkan/vk_instance.h

@@ -104,6 +104,11 @@ public:
         return depth_clip_control;
     }
 
+    /// Returns true when VK_EXT_depth_range_unrestricted is supported
+    bool IsDepthRangeUnrestrictedSupported() const {
+        return depth_range_unrestricted;
+    }
+
     /// Returns true when the extendedDynamicState3ColorWriteMask feature of
     /// VK_EXT_extended_dynamic_state3 is supported.
     bool IsDynamicColorWriteMaskSupported() const {
@@ -340,6 +345,7 @@ private:
     bool custom_border_color{};
     bool fragment_shader_barycentric{};
     bool depth_clip_control{};
+    bool depth_range_unrestricted{};
     bool dynamic_state_3{};
     bool vertex_input_dynamic_state{};
     bool robustness2{};

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -1018,32 +1018,37 @@ void Rasterizer::UpdateViewportScissorState() const {
 
         const auto zoffset = vp_ctl.zoffset_enable ? vp.zoffset : 0.f;
         const auto zscale = vp_ctl.zscale_enable ? vp.zscale : 1.f;
+
+        vk::Viewport viewport = {
+            .minDepth = zoffset - zscale * reduce_z,
+            .maxDepth = zscale + zoffset,
+        };
+        if (!instance.IsDepthRangeUnrestrictedSupported()) {
+            // Unrestricted depth range not supported by device. Make best attempt
+            // by restricting to valid range.
+            viewport.minDepth = std::max(viewport.minDepth, 0.f);
+            viewport.maxDepth = std::min(viewport.maxDepth, 1.f);
+        }
         if (regs.IsClipDisabled()) {
             // In case if clipping is disabled we patch the shader to convert vertex position
             // from screen space coordinates to NDC by defining a render space as full hardware
             // window range [0..16383, 0..16383] and setting the viewport to its size.
-            viewports.push_back({
+            viewport.x = 0.f;
-                .x = 0.f,
+            viewport.y = 0.f;
-                .y = 0.f,
+            viewport.width = float(std::min<u32>(instance.GetMaxViewportWidth(), 16_KB));
-                .width = float(std::min<u32>(instance.GetMaxViewportWidth(), 16_KB)),
+            viewport.height = float(std::min<u32>(instance.GetMaxViewportHeight(), 16_KB));
-                .height = float(std::min<u32>(instance.GetMaxViewportHeight(), 16_KB)),
-                .minDepth = zoffset - zscale * reduce_z,
-                .maxDepth = zscale + zoffset,
-            });
         } else {
             const auto xoffset = vp_ctl.xoffset_enable ? vp.xoffset : 0.f;
             const auto xscale = vp_ctl.xscale_enable ? vp.xscale : 1.f;
             const auto yoffset = vp_ctl.yoffset_enable ? vp.yoffset : 0.f;
             const auto yscale = vp_ctl.yscale_enable ? vp.yscale : 1.f;
-            viewports.push_back({
+
-                .x = xoffset - xscale,
+            viewport.x = xoffset - xscale;
-                .y = yoffset - yscale,
+            viewport.y = yoffset - yscale;
-                .width = xscale * 2.0f,
+            viewport.width = xscale * 2.0f;
-                .height = yscale * 2.0f,
+            viewport.height = yscale * 2.0f;
-                .minDepth = zoffset - zscale * reduce_z,
-                .maxDepth = zscale + zoffset,
-            });
         }
+        viewports.push_back(viewport);
 
         auto vp_scsr = scsr;
         if (regs.mode_control.vport_scissor_enable) {