From 68e1a6a596c248612ac6a84cc92a653a35edae8d Mon Sep 17 00:00:00 2001
From: squidbus <175574877+squidbus@users.noreply.github.com>
Date: Mon, 15 Jul 2024 03:01:39 -0700
Subject: [PATCH] Tidy up Vulkan extension list.

---
 src/video_core/renderer_vulkan/vk_instance.cpp | 8 +++++---
 src/video_core/renderer_vulkan/vk_instance.h   | 6 ------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp
index b11d950f..09a9180e 100644
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@@ -192,13 +192,10 @@ bool Instance::CreateDevice() {
     };
 
     add_extension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
-    image_format_list = add_extension(VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME);
     shader_stencil_export = add_extension(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME);
     external_memory_host = add_extension(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME);
-    tooling_info = add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
     custom_border_color = add_extension(VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME);
     add_extension(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
-    add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
     add_extension(VK_EXT_DEPTH_CLIP_CONTROL_EXTENSION_NAME);
     add_extension(VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME);
     workgroup_memory_explicit_layout =
@@ -207,6 +204,11 @@ bool Instance::CreateDevice() {
     color_write_en = add_extension(VK_EXT_COLOR_WRITE_ENABLE_EXTENSION_NAME);
     color_write_en &= add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME);
     const auto calibrated_timestamps = add_extension(VK_EXT_CALIBRATED_TIMESTAMPS_EXTENSION_NAME);
+
+    // These extensions are promoted by Vulkan 1.3, but for greater compatibility we use Vulkan 1.2
+    // with extensions.
+    tooling_info = add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
+    add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
     add_extension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);
     add_extension(VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME);
 
diff --git a/src/video_core/renderer_vulkan/vk_instance.h b/src/video_core/renderer_vulkan/vk_instance.h
index 0f291d8e..32965ddb 100644
--- a/src/video_core/renderer_vulkan/vk_instance.h
+++ b/src/video_core/renderer_vulkan/vk_instance.h
@@ -108,11 +108,6 @@ public:
         return fragment_shader_interlock;
     }
 
-    /// Returns true when VK_KHR_image_format_list is supported
-    bool IsImageFormatListSupported() const {
-        return image_format_list;
-    }
-
     /// Returns true when VK_EXT_pipeline_creation_cache_control is supported
     bool IsPipelineCreationCacheControlSupported() const {
         return pipeline_creation_cache_control;
@@ -247,7 +242,6 @@ private:
     bool timeline_semaphores{};
     bool custom_border_color{};
     bool fragment_shader_interlock{};
-    bool image_format_list{};
     bool pipeline_creation_cache_control{};
     bool fragment_shader_barycentric{};
     bool shader_stencil_export{};