ShuriZma
/
Ryujinx
mirror of https://github.com/Ryujinx/Ryujinx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc: Fix obsolete warnings in Ryujinx.Graphics.Vulkan (#4020) 

Was caused by some merges after the Silk.NET update
This commit is contained in:
Mary-nyan 2022-12-05 13:57:11 +01:00 committed by GitHub
parent a2a35f1be6
commit ae13f0ab4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Ryujinx.Graphics.Vulkan/HelperShader.cs
View File

@ -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,

2
Ryujinx.Graphics.Vulkan/TextureStorage.cs
View File

@ -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);
}