Fix ~3500 analyser issues

See merge request ryubing/ryujinx!44
This commit is contained in:
MrKev
2025-05-30 17:08:34 -05:00
committed by LotP
parent 417df486b1
commit 361d0c5632
622 changed files with 3080 additions and 2652 deletions

View File

@@ -235,7 +235,7 @@ namespace Ryujinx.Graphics.Vulkan
// Check stage bindings
_uniformMirrored.Union(_uniformSet).SignalSet((int binding, int count) =>
_uniformMirrored.Union(_uniformSet).SignalSet((binding, count) =>
{
for (int i = 0; i < count; i++)
{
@@ -257,7 +257,7 @@ namespace Ryujinx.Graphics.Vulkan
}
});
_storageMirrored.Union(_storageSet).SignalSet((int binding, int count) =>
_storageMirrored.Union(_storageSet).SignalSet((binding, count) =>
{
for (int i = 0; i < count; i++)
{
@@ -348,16 +348,16 @@ namespace Ryujinx.Graphics.Vulkan
if (segment.IsArray)
{
if (segment.Type == ResourceType.Texture ||
segment.Type == ResourceType.Sampler ||
segment.Type == ResourceType.TextureAndSampler ||
segment.Type == ResourceType.BufferTexture)
if (segment.Type is ResourceType.Texture or
ResourceType.Sampler or
ResourceType.TextureAndSampler or
ResourceType.BufferTexture)
{
ref ArrayRef<TextureArray> arrayRef = ref _textureArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts];
PipelineStageFlags stageFlags = arrayRef.Stage.ConvertToPipelineStageFlags();
arrayRef.Array?.QueueWriteToReadBarriers(cbs, stageFlags);
}
else if (segment.Type == ResourceType.Image || segment.Type == ResourceType.BufferImage)
else if (segment.Type is ResourceType.Image or ResourceType.BufferImage)
{
ref ArrayRef<ImageArray> arrayRef = ref _imageArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts];
PipelineStageFlags stageFlags = arrayRef.Stage.ConvertToPipelineStageFlags();
@@ -1072,7 +1072,7 @@ namespace Ryujinx.Graphics.Vulkan
private void Initialize(CommandBufferScoped cbs, int setIndex, DescriptorSetCollection dsc)
{
// We don't support clearing texture descriptors currently.
if (setIndex != PipelineBase.UniformSetIndex && setIndex != PipelineBase.StorageSetIndex)
if (setIndex is not PipelineBase.UniformSetIndex and not PipelineBase.StorageSetIndex)
{
return;
}
@@ -1102,10 +1102,10 @@ namespace Ryujinx.Graphics.Vulkan
{
DescriptorSet[] sets = null;
if (segment.Type == ResourceType.Texture ||
segment.Type == ResourceType.Sampler ||
segment.Type == ResourceType.TextureAndSampler ||
segment.Type == ResourceType.BufferTexture)
if (segment.Type is ResourceType.Texture or
ResourceType.Sampler or
ResourceType.TextureAndSampler or
ResourceType.BufferTexture)
{
sets = _textureArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts].Array.GetDescriptorSets(
_device,
@@ -1116,7 +1116,7 @@ namespace Ryujinx.Graphics.Vulkan
_dummyTexture,
_dummySampler);
}
else if (segment.Type == ResourceType.Image || segment.Type == ResourceType.BufferImage)
else if (segment.Type is ResourceType.Image or ResourceType.BufferImage)
{
sets = _imageArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts].Array.GetDescriptorSets(
_device,