From ae13f0ab4da5b371bba746c1bd6598baaa44585d Mon Sep 17 00:00:00 2001
From: Mary-nyan <mary@mary.zone>
Date: Mon, 5 Dec 2022 13:57:11 +0100
Subject: [PATCH] misc: Fix obsolete warnings in  Ryujinx.Graphics.Vulkan
 (#4020)

Was caused by some merges after the Silk.NET update
---
 Ryujinx.Graphics.Vulkan/HelperShader.cs   | 16 ++++++++--------
 Ryujinx.Graphics.Vulkan/TextureStorage.cs |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Ryujinx.Graphics.Vulkan/HelperShader.cs b/Ryujinx.Graphics.Vulkan/HelperShader.cs
index 8b20dd1aa2..14a636151f 100644
--- a/Ryujinx.Graphics.Vulkan/HelperShader.cs
+++ b/Ryujinx.Graphics.Vulkan/HelperShader.cs
@@ -637,10 +637,10 @@ namespace Ryujinx.Graphics.Vulkan
                 cbs.CommandBuffer,
                 src.GetImage().Get(cbs).Value,
                 TextureStorage.DefaultAccessMask,
-                AccessFlags.AccessShaderReadBit,
-                PipelineStageFlags.PipelineStageAllCommandsBit,
-                PipelineStageFlags.PipelineStageFragmentShaderBit,
-                ImageAspectFlags.ImageAspectColorBit,
+                AccessFlags.ShaderReadBit,
+                PipelineStageFlags.AllCommandsBit,
+                PipelineStageFlags.FragmentShaderBit,
+                ImageAspectFlags.ColorBit,
                 src.FirstLayer + srcLayer,
                 src.FirstLevel,
                 depth,
@@ -726,11 +726,11 @@ namespace Ryujinx.Graphics.Vulkan
                 gd.Api,
                 cbs.CommandBuffer,
                 dst.GetImage().Get(cbs).Value,
-                AccessFlags.AccessColorAttachmentWriteBit,
+                AccessFlags.ColorAttachmentWriteBit,
                 TextureStorage.DefaultAccessMask,
-                PipelineStageFlags.PipelineStageFragmentShaderBit,
-                PipelineStageFlags.PipelineStageAllCommandsBit,
-                ImageAspectFlags.ImageAspectColorBit,
+                PipelineStageFlags.FragmentShaderBit,
+                PipelineStageFlags.AllCommandsBit,
+                ImageAspectFlags.ColorBit,
                 dst.FirstLayer + dstLayer,
                 dst.FirstLevel,
                 depth,
diff --git a/Ryujinx.Graphics.Vulkan/TextureStorage.cs b/Ryujinx.Graphics.Vulkan/TextureStorage.cs
index 591a0c2895..f4feecbcd6 100644
--- a/Ryujinx.Graphics.Vulkan/TextureStorage.cs
+++ b/Ryujinx.Graphics.Vulkan/TextureStorage.cs
@@ -317,7 +317,7 @@ namespace Ryujinx.Graphics.Vulkan
             SampleCountFlags converted = (SampleCountFlags)(1u << (31 - BitOperations.LeadingZeroCount(samples)));
 
             // Pick nearest sample count that the host actually supports.
-            while (converted != SampleCountFlags.SampleCount1Bit && (converted & supportedSampleCounts) == 0)
+            while (converted != SampleCountFlags.Count1Bit && (converted & supportedSampleCounts) == 0)
             {
                 converted = (SampleCountFlags)((uint)converted >> 1);
             }