From a6ca7dca617bc248d863143f8e9a6c08e19e0c4e Mon Sep 17 00:00:00 2001
From: GPUCode <geoster3d@gmail.com>
Date: Mon, 2 Jan 2023 15:38:47 +0200
Subject: [PATCH] vk_instance: Don't specify uint8 extension twice

* I have no idea why this happened
---
 src/video_core/renderer_vulkan/vk_instance.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp
index 21d4dd66c..dee901b79 100644
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@@ -474,11 +474,15 @@ bool Instance::CreateDevice() {
             },
         },
         feature_chain.get<vk::PhysicalDeviceTimelineSemaphoreFeaturesKHR>(),
-        feature_chain.get<vk::PhysicalDeviceIndexTypeUint8FeaturesEXT>(),
         feature_chain.get<vk::PhysicalDeviceExtendedDynamicStateFeaturesEXT>(),
-        feature_chain.get<vk::PhysicalDeviceCustomBorderColorFeaturesEXT>()
+        feature_chain.get<vk::PhysicalDeviceCustomBorderColorFeaturesEXT>(),
+        feature_chain.get<vk::PhysicalDeviceIndexTypeUint8FeaturesEXT>(),
     };
 
+    if (!index_type_uint8) {
+        device_chain.unlink<vk::PhysicalDeviceIndexTypeUint8FeaturesEXT>();
+    }
+
     if (!extended_dynamic_state) {
         device_chain.unlink<vk::PhysicalDeviceExtendedDynamicStateFeaturesEXT>();
     }
@@ -487,16 +491,14 @@ bool Instance::CreateDevice() {
         device_chain.unlink<vk::PhysicalDeviceCustomBorderColorFeaturesEXT>();
     }
 
-    if (!index_type_uint8) {
-        device_chain.unlink<vk::PhysicalDeviceIndexTypeUint8FeaturesEXT>();
-    }
-
+#if __APPLE__
     const vk::StructureChain portability_chain =
         physical_device.getFeatures2<vk::PhysicalDeviceFeatures2,
                                      vk::PhysicalDevicePortabilitySubsetFeaturesKHR>();
     const vk::PhysicalDevicePortabilitySubsetFeaturesKHR portability_features =
         portability_chain.get<vk::PhysicalDevicePortabilitySubsetFeaturesKHR>();
     triangle_fan_supported = portability_features.triangleFans;
+#endif
 
     try {
         device = physical_device.createDevice(device_chain.get());