mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-11-28 05:44:03 +00:00
[Ryujinx.Graphics.Vic] Address dotnet-format issues (#5374)
* dotnet format style --severity info Some changes were manually reverted. * Restore a few unused methods and variables * Address review comments * Address most dotnet format whitespace warnings * Add comments to disabled warnings * Address IDE0251 warnings * dotnet format whitespace after rebase * Remove SuppressMessage attribute for removed rule
This commit is contained in:
parent
bddb2a1483
commit
bc53d00463
19 changed files with 62 additions and 59 deletions
|
@ -34,7 +34,7 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
{
|
{
|
||||||
int index = RentMinimum(length, out T[] bufferArray);
|
int index = RentMinimum(length, out T[] bufferArray);
|
||||||
|
|
||||||
buffer = new Span<T>(bufferArray).Slice(0, length);
|
buffer = new Span<T>(bufferArray)[..length];
|
||||||
|
|
||||||
return index;
|
return index;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
{
|
{
|
||||||
ref struct RentedBuffer
|
ref struct RentedBuffer
|
||||||
{
|
{
|
||||||
public static RentedBuffer Empty => new RentedBuffer(Span<byte>.Empty, -1);
|
public static RentedBuffer Empty => new(Span<byte>.Empty, -1);
|
||||||
|
|
||||||
public Span<byte> Data;
|
public Span<byte> Data;
|
||||||
public int Index;
|
public int Index;
|
||||||
|
@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
Index = index;
|
Index = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Return(BufferPool<byte> pool)
|
public readonly void Return(BufferPool<byte> pool)
|
||||||
{
|
{
|
||||||
if (Index != -1)
|
if (Index != -1)
|
||||||
{
|
{
|
||||||
|
@ -65,7 +65,7 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
Buffer2Index = buffer.Index;
|
Buffer2Index = buffer.Index;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Return(BufferPool<byte> pool)
|
public readonly void Return(BufferPool<byte> pool)
|
||||||
{
|
{
|
||||||
if (Buffer0Index != -1)
|
if (Buffer0Index != -1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,7 +21,8 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
{
|
{
|
||||||
switch (surfaceConfig.SlotPixelFormat)
|
switch (surfaceConfig.SlotPixelFormat)
|
||||||
{
|
{
|
||||||
case PixelFormat.Y8___V8U8_N420: return ReadNv12(rm, ref config, ref surfaceConfig, ref offsets);
|
case PixelFormat.Y8___V8U8_N420:
|
||||||
|
return ReadNv12(rm, ref config, ref surfaceConfig, ref offsets);
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.Error?.Print(LogClass.Vic, $"Unsupported pixel format \"{surfaceConfig.SlotPixelFormat}\".");
|
Logger.Error?.Print(LogClass.Vic, $"Unsupported pixel format \"{surfaceConfig.SlotPixelFormat}\".");
|
||||||
|
@ -46,7 +47,7 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
int yStride = GetPitch(width, 1);
|
int yStride = GetPitch(width, 1);
|
||||||
int uvStride = GetPitch(input.UvWidth, 2);
|
int uvStride = GetPitch(input.UvWidth, 2);
|
||||||
|
|
||||||
Surface output = new Surface(rm.SurfacePool, width, height);
|
Surface output = new(rm.SurfacePool, width, height);
|
||||||
|
|
||||||
if (Sse41.IsSupported)
|
if (Sse41.IsSupported)
|
||||||
{
|
{
|
||||||
|
@ -276,7 +277,7 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
int bytesPerPixel,
|
int bytesPerPixel,
|
||||||
int planes)
|
int planes)
|
||||||
{
|
{
|
||||||
InputSurface surface = new InputSurface();
|
InputSurface surface = new();
|
||||||
|
|
||||||
surface.Initialize();
|
surface.Initialize();
|
||||||
|
|
||||||
|
@ -458,7 +459,7 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
int outSize = dstStride * height;
|
int outSize = dstStride * height;
|
||||||
int bufferIndex = rm.BufferPool.RentMinimum(outSize, out byte[] buffer);
|
int bufferIndex = rm.BufferPool.RentMinimum(outSize, out byte[] buffer);
|
||||||
Span<byte> dst = buffer;
|
Span<byte> dst = buffer;
|
||||||
dst = dst.Slice(0, outSize);
|
dst = dst[..outSize];
|
||||||
|
|
||||||
for (int y = 0; y < height; y++)
|
for (int y = 0; y < height; y++)
|
||||||
{
|
{
|
||||||
|
@ -485,9 +486,9 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
int outSize = dstStride * height;
|
int outSize = dstStride * height;
|
||||||
int bufferIndex = rm.BufferPool.RentMinimum(outSize, out byte[] buffer);
|
int bufferIndex = rm.BufferPool.RentMinimum(outSize, out byte[] buffer);
|
||||||
Span<byte> dst = buffer;
|
Span<byte> dst = buffer;
|
||||||
dst = dst.Slice(0, outSize);
|
dst = dst[..outSize];
|
||||||
|
|
||||||
LayoutConverter.ConvertBlockLinearToLinear(dst.Slice(dstStart), width, height, dstStride, bytesPerPixel, gobBlocksInY, src);
|
LayoutConverter.ConvertBlockLinearToLinear(dst[dstStart..], width, height, dstStride, bytesPerPixel, gobBlocksInY, src);
|
||||||
|
|
||||||
return new RentedBuffer(dst, bufferIndex);
|
return new RentedBuffer(dst, bufferIndex);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,4 +15,4 @@ namespace Ryujinx.Graphics.Vic
|
||||||
Height = height;
|
Height = height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,4 +121,4 @@ namespace Ryujinx.Graphics.Vic
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct BlendingSlotStruct
|
readonly struct BlendingSlotStruct
|
||||||
{
|
{
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
|
|
||||||
public int AlphaK1 => (int)_word0.Extract(0, 10);
|
public int AlphaK1 => (int)_word0.Extract(0, 10);
|
||||||
public int AlphaK2 => (int)_word0.Extract(16, 10);
|
public int AlphaK2 => (int)_word0.Extract(16, 10);
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct ClearRectStruct
|
readonly struct ClearRectStruct
|
||||||
{
|
{
|
||||||
#pragma warning disable CS0649
|
#pragma warning disable CS0649 // Field is never assigned to
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
#pragma warning restore CS0649
|
#pragma warning restore CS0649
|
||||||
|
|
||||||
public int ClearRect0Left => (int)_word0.Extract(0, 14);
|
public int ClearRect0Left => (int)_word0.Extract(0, 14);
|
||||||
|
|
|
@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct ConfigStruct
|
struct ConfigStruct
|
||||||
{
|
{
|
||||||
#pragma warning disable CS0649
|
#pragma warning disable CS0649 // Field is never assigned to
|
||||||
public PipeConfig PipeConfig;
|
public PipeConfig PipeConfig;
|
||||||
public OutputConfig OutputConfig;
|
public OutputConfig OutputConfig;
|
||||||
public OutputSurfaceConfig OutputSurfaceConfig;
|
public OutputSurfaceConfig OutputSurfaceConfig;
|
||||||
|
|
|
@ -9,4 +9,4 @@ namespace Ryujinx.Graphics.Vic.Types
|
||||||
Disi1,
|
Disi1,
|
||||||
WeaveLumaBobFieldChroma
|
WeaveLumaBobFieldChroma
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,4 +76,4 @@ namespace Ryujinx.Graphics.Vic.Types
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct LumaKeyStruct
|
readonly struct LumaKeyStruct
|
||||||
{
|
{
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
|
|
||||||
public int LumaCoeff0 => (int)_word0.Extract(0, 20);
|
public int LumaCoeff0 => (int)_word0.Extract(0, 20);
|
||||||
public int LumaCoeff1 => (int)_word0.Extract(20, 20);
|
public int LumaCoeff1 => (int)_word0.Extract(20, 20);
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct MatrixStruct
|
readonly struct MatrixStruct
|
||||||
{
|
{
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
private long _word2;
|
private readonly long _word2;
|
||||||
private long _word3;
|
private readonly long _word3;
|
||||||
|
|
||||||
public int MatrixCoeff00 => (int)_word0.ExtractSx(0, 20);
|
public int MatrixCoeff00 => (int)_word0.ExtractSx(0, 20);
|
||||||
public int MatrixCoeff10 => (int)_word0.ExtractSx(20, 20);
|
public int MatrixCoeff10 => (int)_word0.ExtractSx(20, 20);
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct OutputConfig
|
readonly struct OutputConfig
|
||||||
{
|
{
|
||||||
#pragma warning disable CS0649
|
#pragma warning disable CS0649 // Field is never assigned to
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
#pragma warning restore CS0649
|
#pragma warning restore CS0649
|
||||||
|
|
||||||
public int AlphaFillMode => (int)_word0.Extract(0, 3);
|
public int AlphaFillMode => (int)_word0.Extract(0, 3);
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct OutputSurfaceConfig
|
readonly struct OutputSurfaceConfig
|
||||||
{
|
{
|
||||||
#pragma warning disable CS0649
|
#pragma warning disable CS0649 // Field is never assigned to
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
#pragma warning restore CS0649
|
#pragma warning restore CS0649
|
||||||
|
|
||||||
public PixelFormat OutPixelFormat => (PixelFormat)_word0.Extract(0, 7);
|
public PixelFormat OutPixelFormat => (PixelFormat)_word0.Extract(0, 7);
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct PipeConfig
|
readonly struct PipeConfig
|
||||||
{
|
{
|
||||||
#pragma warning disable CS0169, CS0649
|
#pragma warning disable CS0169, CS0649, IDE0051 // Remove unused private member
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
#pragma warning restore CS0169, CS0649
|
#pragma warning restore CS0169, CS0649, IDE0051
|
||||||
|
|
||||||
public int DownsampleHoriz => (int)_word0.Extract(0, 11);
|
public int DownsampleHoriz => (int)_word0.Extract(0, 11);
|
||||||
public int DownsampleVert => (int)_word0.Extract(16, 11);
|
public int DownsampleVert => (int)_word0.Extract(16, 11);
|
||||||
|
|
|
@ -2,16 +2,18 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct SlotConfig
|
readonly struct SlotConfig
|
||||||
{
|
{
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
private long _word2;
|
private readonly long _word2;
|
||||||
private long _word3;
|
private readonly long _word3;
|
||||||
private long _word4;
|
private readonly long _word4;
|
||||||
private long _word5;
|
private readonly long _word5;
|
||||||
private long _word6;
|
private readonly long _word6;
|
||||||
private long _word7;
|
#pragma warning disable IDE0051 // Remove unused private member
|
||||||
|
private readonly long _word7;
|
||||||
|
#pragma warning restore IDE0051
|
||||||
|
|
||||||
public bool SlotEnable => _word0.Extract(0);
|
public bool SlotEnable => _word0.Extract(0);
|
||||||
public bool DeNoise => _word0.Extract(1);
|
public bool DeNoise => _word0.Extract(1);
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic.Types
|
namespace Ryujinx.Graphics.Vic.Types
|
||||||
{
|
{
|
||||||
struct SlotSurfaceConfig
|
readonly struct SlotSurfaceConfig
|
||||||
{
|
{
|
||||||
private long _word0;
|
private readonly long _word0;
|
||||||
private long _word1;
|
private readonly long _word1;
|
||||||
|
|
||||||
public PixelFormat SlotPixelFormat => (PixelFormat)_word0.Extract(0, 7);
|
public PixelFormat SlotPixelFormat => (PixelFormat)_word0.Extract(0, 7);
|
||||||
public int SlotChromaLocHoriz => (int)_word0.Extract(7, 2);
|
public int SlotChromaLocHoriz => (int)_word0.Extract(7, 2);
|
||||||
|
|
|
@ -30,7 +30,7 @@ namespace Ryujinx.Graphics.Vic
|
||||||
{
|
{
|
||||||
ConfigStruct config = ReadIndirect<ConfigStruct>(_state.State.SetConfigStructOffset);
|
ConfigStruct config = ReadIndirect<ConfigStruct>(_state.State.SetConfigStructOffset);
|
||||||
|
|
||||||
using Surface output = new Surface(
|
using Surface output = new(
|
||||||
_rm.SurfacePool,
|
_rm.SurfacePool,
|
||||||
config.OutputSurfaceConfig.OutSurfaceWidth + 1,
|
config.OutputSurfaceConfig.OutSurfaceWidth + 1,
|
||||||
config.OutputSurfaceConfig.OutSurfaceHeight + 1);
|
config.OutputSurfaceConfig.OutSurfaceHeight + 1);
|
||||||
|
@ -58,7 +58,7 @@ namespace Ryujinx.Graphics.Vic
|
||||||
int targetW = Math.Min(output.Width - targetX, Math.Abs(x2 - x1));
|
int targetW = Math.Min(output.Width - targetX, Math.Abs(x2 - x1));
|
||||||
int targetH = Math.Min(output.Height - targetY, Math.Abs(y2 - y1));
|
int targetH = Math.Min(output.Height - targetY, Math.Abs(y2 - y1));
|
||||||
|
|
||||||
Rectangle targetRect = new Rectangle(targetX, targetY, targetW, targetH);
|
Rectangle targetRect = new(targetX, targetY, targetW, targetH);
|
||||||
|
|
||||||
Blender.BlendOne(output, src, ref slot, targetRect);
|
Blender.BlendOne(output, src, ref slot, targetRect);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Vic
|
||||||
{
|
{
|
||||||
struct PlaneOffsets
|
struct PlaneOffsets
|
||||||
{
|
{
|
||||||
#pragma warning disable CS0649
|
#pragma warning disable CS0649 // Field is never assigned to
|
||||||
public uint LumaOffset;
|
public uint LumaOffset;
|
||||||
public uint ChromaUOffset;
|
public uint ChromaUOffset;
|
||||||
public uint ChromaVOffset;
|
public uint ChromaVOffset;
|
||||||
|
@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Vic
|
||||||
|
|
||||||
struct VicRegisters
|
struct VicRegisters
|
||||||
{
|
{
|
||||||
#pragma warning disable CS0649
|
#pragma warning disable CS0649 // Field is never assigned to
|
||||||
public Array64<uint> Reserved0;
|
public Array64<uint> Reserved0;
|
||||||
public uint Nop;
|
public uint Nop;
|
||||||
public Array15<uint> Reserved104;
|
public Array15<uint> Reserved104;
|
||||||
|
|
Loading…
Reference in a new issue