Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-09-28 03:57:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

misc: chore: Merge into pattern

Browse Source
This commit is contained in:
KeatonTheBot
2025-09-24 13:51:15 -05:00
parent 503dea74c2
commit fa682d406e
157 changed files with 470 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx.Graphics.Vulkan/DescriptorSetTemplate.cs
+2 -2
View File
@@ -194,12 +194,12 @@ namespace Ryujinx.Graphics.Vulkan
private static bool IsBufferType(ResourceType type)
{
return type == ResourceType.UniformBuffer || type == ResourceType.StorageBuffer;
return type is ResourceType.UniformBuffer or ResourceType.StorageBuffer;
}
private static bool IsBufferTextureType(ResourceType type)
{
return type == ResourceType.BufferTexture || type == ResourceType.BufferImage;
return type is ResourceType.BufferTexture or ResourceType.BufferImage;
}
public unsafe void Dispose()
src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
+10 -10
View File
@@ -347,16 +347,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 var 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 var arrayRef = ref _imageArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts];
PipelineStageFlags stageFlags = arrayRef.Stage.ConvertToPipelineStageFlags();
@@ -1101,10 +1101,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,
@@ -1115,7 +1115,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,
src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs
+2 -4
View File
@@ -222,14 +222,12 @@ namespace Ryujinx.Graphics.Vulkan
public static bool IsD24S8(Format format)
{
return format == Format.D24UnormS8Uint || format == Format.S8UintD24Unorm || format == Format.X8UintD24Unorm;
return format is Format.D24UnormS8Uint or Format.S8UintD24Unorm or Format.X8UintD24Unorm;
}
private static bool IsRGB16IntFloat(Format format)
{
return format == Format.R16G16B16Float ||
format == Format.R16G16B16Sint ||
format == Format.R16G16B16Uint;
return format is Format.R16G16B16Float or Format.R16G16B16Sint or Format.R16G16B16Uint;
}
}
}
src/Ryujinx.Graphics.Vulkan/PipelineState.cs
+5 -5
View File
@@ -432,11 +432,11 @@ namespace Ryujinx.Graphics.Vulkan
}
else
{
topologySupportsRestart = Topology == PrimitiveTopology.LineStrip ||
Topology == PrimitiveTopology.TriangleStrip ||
Topology == PrimitiveTopology.TriangleFan ||
Topology == PrimitiveTopology.LineStripWithAdjacency ||
Topology == PrimitiveTopology.TriangleStripWithAdjacency;
topologySupportsRestart = Topology is PrimitiveTopology.LineStrip
or PrimitiveTopology.TriangleStrip
or PrimitiveTopology.TriangleFan
or PrimitiveTopology.LineStripWithAdjacency
or PrimitiveTopology.TriangleStripWithAdjacency;
}
primitiveRestartEnable &= topologySupportsRestart;
src/Ryujinx.Graphics.Vulkan/SamplerHolder.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace Ryujinx.Graphics.Vulkan
float minLod = info.MinLod;
float maxLod = info.MaxLod;
if (info.MinFilter == MinFilter.Nearest || info.MinFilter == MinFilter.Linear)
if (info.MinFilter is MinFilter.Nearest or MinFilter.Linear)
{
minLod = 0;
maxLod = 0.25f;
src/Ryujinx.Graphics.Vulkan/TextureStorage.cs
+2 -2
View File
@@ -98,7 +98,7 @@ namespace Ryujinx.Graphics.Vulkan
var flags = ImageCreateFlags.CreateMutableFormatBit | ImageCreateFlags.CreateExtendedUsageBit;
// This flag causes mipmapped texture arrays to break on AMD GCN, so for that copy dependencies are forced for aliasing as cube.
bool isCube = info.Target == Target.Cubemap || info.Target == Target.CubemapArray;
bool isCube = info.Target is Target.Cubemap or Target.CubemapArray;
bool cubeCompatible = gd.IsAmdGcn ? isCube : (info.Width == info.Height && layers >= 6);
if (type == ImageType.Type2D && cubeCompatible)
@@ -338,7 +338,7 @@ namespace Ryujinx.Graphics.Vulkan
public static SampleCountFlags ConvertToSampleCountFlags(SampleCountFlags supportedSampleCounts, uint samples)
{
if (samples == 0 || samples > (uint)SampleCountFlags.Count64Bit)
if (samples is 0 or > (uint)SampleCountFlags.Count64Bit)
{
return SampleCountFlags.Count1Bit;
}
src/Ryujinx.Graphics.Vulkan/TextureView.cs
+1 -3
View File
@@ -77,9 +77,7 @@ namespace Ryujinx.Graphics.Vulkan
var swizzleB = info.SwizzleB.Convert();
var swizzleA = info.SwizzleA.Convert();
if (info.Format == Format.R5G5B5A1Unorm ||
info.Format == Format.R5G5B5X1Unorm ||
info.Format == Format.R5G6B5Unorm)
if (info.Format is Format.R5G5B5A1Unorm or Format.R5G5B5X1Unorm or Format.R5G6B5Unorm)
{
(swizzleB, swizzleR) = (swizzleR, swizzleB);
}
src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
+1 -5
View File
@@ -355,11 +355,7 @@ namespace Ryujinx.Graphics.Vulkan
IsAmdWindows = Vendor == Vendor.Amd && OperatingSystem.IsWindows();
IsIntelWindows = Vendor == Vendor.Intel && OperatingSystem.IsWindows();
IsTBDR =
Vendor == Vendor.Apple ||
Vendor == Vendor.Qualcomm ||
Vendor == Vendor.ARM ||
Vendor == Vendor.Broadcom ||
Vendor == Vendor.ImgTec;
Vendor is Vendor.Apple or Vendor.Qualcomm or Vendor.ARM or Vendor.Broadcom or Vendor.ImgTec;
GpuVendor = VendorUtils.GetNameFromId(properties.VendorID);
GpuDriver = hasDriverProperties && !OperatingSystem.IsMacOS() ?