From 247e935353852bdb64bcfe76a5f74ab2c6c01239 Mon Sep 17 00:00:00 2001
From: squidbus <175574877+squidbus@users.noreply.github.com>
Date: Tue, 15 Apr 2025 17:13:19 -0700
Subject: [PATCH] externals: Update MoltenVK (#2791)

---
 .gitmodules                                    | 2 +-
 externals/MoltenVK/MoltenVK                    | 2 +-
 externals/MoltenVK/SPIRV-Cross                 | 2 +-
 src/video_core/renderer_vulkan/vk_instance.cpp | 5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 065a4570f..9daefe305 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -97,7 +97,7 @@
 	shallow = true
 [submodule "externals/MoltenVK/SPIRV-Cross"]
 	path = externals/MoltenVK/SPIRV-Cross
-	url = https://github.com/KhronosGroup/SPIRV-Cross
+	url = https://github.com/billhollings/SPIRV-Cross
 	shallow = true
 [submodule "externals/MoltenVK/MoltenVK"]
 	path = externals/MoltenVK/MoltenVK
diff --git a/externals/MoltenVK/MoltenVK b/externals/MoltenVK/MoltenVK
index 83510e0f3..067fc6c85 160000
--- a/externals/MoltenVK/MoltenVK
+++ b/externals/MoltenVK/MoltenVK
@@ -1 +1 @@
-Subproject commit 83510e0f3835c3c43651dda087305abc42572e17
+Subproject commit 067fc6c85b02f37dfda58eeda49d8458e093ed60
diff --git a/externals/MoltenVK/SPIRV-Cross b/externals/MoltenVK/SPIRV-Cross
index 68300dc07..185833a61 160000
--- a/externals/MoltenVK/SPIRV-Cross
+++ b/externals/MoltenVK/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit 68300dc07ac3dc592dbbdb87e02d5180f984ad12
+Subproject commit 185833a61cbe29ce3bfb5a499ffb3dfeaee3bbe7
diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp
index d45889054..f83f63036 100644
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@@ -249,7 +249,7 @@ bool Instance::CreateDevice() {
     add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);
     add_extension(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);
     add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
-    const bool maintenance4 = add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
+    add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
 
     add_extension(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
     add_extension(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
@@ -422,9 +422,6 @@ bool Instance::CreateDevice() {
 #endif
     };
 
-    if (!maintenance4) {
-        device_chain.unlink<vk::PhysicalDeviceMaintenance4FeaturesKHR>();
-    }
     if (!custom_border_color) {
         device_chain.unlink<vk::PhysicalDeviceCustomBorderColorFeaturesEXT>();
     }