diff options
author | Mary-nyan <mary@mary.zone> | 2022-12-05 13:57:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-05 12:57:11 +0000 |
commit | ae13f0ab4da5b371bba746c1bd6598baaa44585d (patch) | |
tree | a0e59fd329800a6b29385e740f93b51ec74620ae | |
parent | a2a35f1be66112a29f98fedc375f505344a690dd (diff) |
misc: Fix obsolete warnings in Ryujinx.Graphics.Vulkan (#4020)1.1.425
Was caused by some merges after the Silk.NET update
-rw-r--r-- | Ryujinx.Graphics.Vulkan/HelperShader.cs | 16 | ||||
-rw-r--r-- | 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 8b20dd1a..14a63615 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 591a0c28..f4feecbc 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); } |