From b46e386f12220e3fbfa3152d168fc07f79879832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 22 Oct 2026 18:33:16 +0200
Subject: [PATCH] Vulkan: Enable the portability subset features MoltenVK has

We queried VkPhysicalDevicePortabilitySubsetFeaturesKHR but never enabled
it at device creation, so to the validation layers we were using image
view swizzles (and sampler LOD bias) without having them. Enable whatever
the device offers.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 Common/GPU/Vulkan/VulkanContext.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp
index 8bcec8cb35..827737b195 100644
--- a/Common/GPU/Vulkan/VulkanContext.cpp
+++ b/Common/GPU/Vulkan/VulkanContext.cpp
@@ -889,6 +889,13 @@ VkResult VulkanContext::CreateDevice(int physical_device, const std::vector<cons
 		deviceFeatures_.enabled.scalarBlockLayout.scalarBlockLayout = deviceFeatures_.available.scalarBlockLayout.scalarBlockLayout;
 	}
 
+	// What MoltenVK can do of what full Vulkan can (like image view swizzles). Using any of it needs it enabled.
+	deviceFeatures_.enabled.portabilitySubset = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PORTABILITY_SUBSET_FEATURES_KHR };
+	if (extensionsLookup_.KHR_portability_subset) {
+		deviceFeatures_.enabled.portabilitySubset = deviceFeatures_.available.portabilitySubset;
+		deviceFeatures_.enabled.portabilitySubset.pNext = nullptr;
+	}
+
 	// deviceFeatures_.enabled.multiview.multiviewGeometryShader = deviceFeatures_.available.multiview.multiviewGeometryShader;
 
 	VkPhysicalDeviceFeatures2 features2{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2 };
@@ -920,6 +927,9 @@ VkResult VulkanContext::CreateDevice(int physical_device, const std::vector<cons
 		if (extensionsLookup_.KHR_present_mode_fifo_latest_ready) {
 			ChainStruct(features2, &deviceFeatures_.enabled.presentModeFifoProps);
 		}
+		if (extensionsLookup_.KHR_portability_subset) {
+			ChainStruct(features2, &deviceFeatures_.enabled.portabilitySubset);
+		}
 	} else {
 		device_info.pEnabledFeatures = &deviceFeatures_.enabled.standard;
 	}