Revert "Relax Vulkan requirements (#4228)" (#4279)

This reverts commit dca5b14493e730960ed5cd67906278ecea969b3a.

1 files changed, 5 insertions, 17 deletions

diff --git a/Ryujinx.Graphics.Vulkan/Window.cs b/Ryujinx.Graphics.Vulkan/Window.cs
index 27ebb0de..d37dd7e9 100644
--- a/Ryujinx.Graphics.Vulkan/Window.cs
+++ b/Ryujinx.Graphics.Vulkan/Window.cs
@@ -113,7 +113,7 @@ namespace Ryujinx.Graphics.Vulkan
                 ImageSharingMode = SharingMode.Exclusive,
                 ImageArrayLayers = 1,
                 PreTransform = capabilities.CurrentTransform,
-                CompositeAlpha = ChooseCompositeAlpha(capabilities.SupportedCompositeAlpha),
+                CompositeAlpha = CompositeAlphaFlagsKHR.OpaqueBitKhr,
                 PresentMode = ChooseSwapPresentMode(presentModes, _vsyncEnabled),
                 Clipped = true,
                 OldSwapchain = oldSwapchain
@@ -182,22 +182,6 @@ namespace Ryujinx.Graphics.Vulkan
             return availableFormats[0];
         }
 
-        private static CompositeAlphaFlagsKHR ChooseCompositeAlpha(CompositeAlphaFlagsKHR supportedFlags)
-        {
-            if (supportedFlags.HasFlag(CompositeAlphaFlagsKHR.OpaqueBitKhr))
-            {
-                return CompositeAlphaFlagsKHR.OpaqueBitKhr;
-            }
-            else if (supportedFlags.HasFlag(CompositeAlphaFlagsKHR.PreMultipliedBitKhr))
-            {
-                return CompositeAlphaFlagsKHR.PreMultipliedBitKhr;
-            }
-            else
-            {
-                return CompositeAlphaFlagsKHR.InheritBitKhr;
-            }
-        }
-
         private static PresentModeKHR ChooseSwapPresentMode(PresentModeKHR[] availablePresentModes, bool vsyncEnabled)
         {
             if (!vsyncEnabled && availablePresentModes.Contains(PresentModeKHR.ImmediateKhr))
@@ -208,6 +192,10 @@ namespace Ryujinx.Graphics.Vulkan
             {
                 return PresentModeKHR.MailboxKhr;
             }
+            else if (availablePresentModes.Contains(PresentModeKHR.FifoKhr))
+            {
+               return PresentModeKHR.FifoKhr;
+            }
             else
             {
                 return PresentModeKHR.FifoKhr;