alexx009/jinx
Archived
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

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

Browse source 
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, cbs.CommandBuffer,
src.GetImage().Get(cbs).Value, src.GetImage().Get(cbs).Value,
TextureStorage.DefaultAccessMask, TextureStorage.DefaultAccessMask,
AccessFlags.AccessShaderReadBit, AccessFlags.ShaderReadBit,
PipelineStageFlags.PipelineStageAllCommandsBit, PipelineStageFlags.AllCommandsBit,
PipelineStageFlags.PipelineStageFragmentShaderBit, PipelineStageFlags.FragmentShaderBit,
ImageAspectFlags.ImageAspectColorBit, ImageAspectFlags.ColorBit,
src.FirstLayer + srcLayer, src.FirstLayer + srcLayer,
src.FirstLevel, src.FirstLevel,
depth, depth,
@ -726,11 +726,11 @@ namespace Ryujinx.Graphics.Vulkan
gd.Api, gd.Api,
cbs.CommandBuffer, cbs.CommandBuffer,
dst.GetImage().Get(cbs).Value, dst.GetImage().Get(cbs).Value,
AccessFlags.AccessColorAttachmentWriteBit, AccessFlags.ColorAttachmentWriteBit,
TextureStorage.DefaultAccessMask, TextureStorage.DefaultAccessMask,
PipelineStageFlags.PipelineStageFragmentShaderBit, PipelineStageFlags.FragmentShaderBit,
PipelineStageFlags.PipelineStageAllCommandsBit, PipelineStageFlags.AllCommandsBit,
ImageAspectFlags.ImageAspectColorBit, ImageAspectFlags.ColorBit,
dst.FirstLayer + dstLayer, dst.FirstLayer + dstLayer,
dst.FirstLevel, dst.FirstLevel,
depth, 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))); SampleCountFlags converted = (SampleCountFlags)(1u << (31 - BitOperations.LeadingZeroCount(samples)));
// Pick nearest sample count that the host actually supports. // 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); converted = (SampleCountFlags)((uint)converted >> 1);
} }