aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Graphics.Nvdec/Types
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-06-25 21:44:42 +0200
committerGitHub <noreply@github.com>2023-06-25 21:44:42 +0200
commit07fc3ded687fd1321f9ae73d0c72b2d7566c87d5 (patch)
tree6997ddb53f0194b644946a4bc92d18002865ee1e /src/Ryujinx.Graphics.Nvdec/Types
parentfd01259d2b43efcb67efdb32c8879c67e96ccdfe (diff)
[Ryujinx.Graphics.Nvdec] Address dotnet-format issues (#5369)
* dotnet format style --severity info Some changes were manually reverted. * Restore a few unused methods and variables * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Add comments to disabled warnings * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Address IDE0251 warnings * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass
Diffstat (limited to 'src/Ryujinx.Graphics.Nvdec/Types')
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/H264/PictureInfo.cs39
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/H264/ReferenceFrame.cs4
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/Vp8/PictureInfo.cs2
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/Vp9/EntropyProbs.cs2
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameSize.cs2
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameStats.cs2
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/Vp9/LoopFilter.cs2
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs4
-rw-r--r--src/Ryujinx.Graphics.Nvdec/Types/Vp9/Segmentation.cs2
9 files changed, 30 insertions, 29 deletions
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/H264/PictureInfo.cs b/src/Ryujinx.Graphics.Nvdec/Types/H264/PictureInfo.cs
index 7c779dff..c0e0a463 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/H264/PictureInfo.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/H264/PictureInfo.cs
@@ -5,8 +5,9 @@ namespace Ryujinx.Graphics.Nvdec.Types.H264
{
struct PictureInfo
{
-#pragma warning disable CS0169, CS0649
+#pragma warning disable IDE0051, CS0169, CS0649 // Remove unused private member
Array18<uint> Unknown0;
+#pragma warning restore IDE0051
public uint BitstreamSize;
public uint NumSlices;
public uint Unknown50;
@@ -50,24 +51,24 @@ namespace Ryujinx.Graphics.Nvdec.Types.H264
public Array10<uint> Unknown2D4;
#pragma warning restore CS0169, CS0649
- public bool MbAdaptiveFrameFieldFlag => (Flags & (1 << 0)) != 0;
- public bool Direct8x8InferenceFlag => (Flags & (1 << 1)) != 0;
- public bool WeightedPredFlag => (Flags & (1 << 2)) != 0;
- public bool ConstrainedIntraPredFlag => (Flags & (1 << 3)) != 0;
- public bool IsReference => (Flags & (1 << 4)) != 0;
- public bool FieldPicFlag => (Flags & (1 << 5)) != 0;
- public bool BottomFieldFlag => (Flags & (1 << 6)) != 0;
- public uint Log2MaxFrameNumMinus4 => (uint)(Flags >> 8) & 0xf;
- public ushort ChromaFormatIdc => (ushort)((Flags >> 12) & 3);
- public uint PicOrderCntType => (uint)(Flags >> 14) & 3;
- public int PicInitQpMinus26 => ExtractSx(Flags, 16, 6);
- public int ChromaQpIndexOffset => ExtractSx(Flags, 22, 5);
- public int SecondChromaQpIndexOffset => ExtractSx(Flags, 27, 5);
- public uint WeightedBipredIdc => (uint)(Flags >> 32) & 3;
- public uint OutputSurfaceIndex => (uint)(Flags >> 34) & 0x7f;
- public uint ColIndex => (uint)(Flags >> 41) & 0x1f;
- public ushort FrameNum => (ushort)(Flags >> 46);
- public bool QpprimeYZeroTransformBypassFlag => (Flags2 & (1 << 1)) != 0;
+ public readonly bool MbAdaptiveFrameFieldFlag => (Flags & (1 << 0)) != 0;
+ public readonly bool Direct8x8InferenceFlag => (Flags & (1 << 1)) != 0;
+ public readonly bool WeightedPredFlag => (Flags & (1 << 2)) != 0;
+ public readonly bool ConstrainedIntraPredFlag => (Flags & (1 << 3)) != 0;
+ public readonly bool IsReference => (Flags & (1 << 4)) != 0;
+ public readonly bool FieldPicFlag => (Flags & (1 << 5)) != 0;
+ public readonly bool BottomFieldFlag => (Flags & (1 << 6)) != 0;
+ public readonly uint Log2MaxFrameNumMinus4 => (uint)(Flags >> 8) & 0xf;
+ public readonly ushort ChromaFormatIdc => (ushort)((Flags >> 12) & 3);
+ public readonly uint PicOrderCntType => (uint)(Flags >> 14) & 3;
+ public readonly int PicInitQpMinus26 => ExtractSx(Flags, 16, 6);
+ public readonly int ChromaQpIndexOffset => ExtractSx(Flags, 22, 5);
+ public readonly int SecondChromaQpIndexOffset => ExtractSx(Flags, 27, 5);
+ public readonly uint WeightedBipredIdc => (uint)(Flags >> 32) & 3;
+ public readonly uint OutputSurfaceIndex => (uint)(Flags >> 34) & 0x7f;
+ public readonly uint ColIndex => (uint)(Flags >> 41) & 0x1f;
+ public readonly ushort FrameNum => (ushort)(Flags >> 46);
+ public readonly bool QpprimeYZeroTransformBypassFlag => (Flags2 & (1 << 1)) != 0;
private static int ExtractSx(ulong packed, int lsb, int length)
{
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/H264/ReferenceFrame.cs b/src/Ryujinx.Graphics.Nvdec/Types/H264/ReferenceFrame.cs
index d205a47a..9ab9d132 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/H264/ReferenceFrame.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/H264/ReferenceFrame.cs
@@ -4,12 +4,12 @@ namespace Ryujinx.Graphics.Nvdec.Types.H264
{
struct ReferenceFrame
{
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
public uint Flags;
public Array2<uint> FieldOrderCnt;
public uint FrameNum;
#pragma warning restore CS0649
- public uint OutputSurfaceIndex => (uint)Flags & 0x7f;
+ public readonly uint OutputSurfaceIndex => (uint)Flags & 0x7f;
}
}
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/Vp8/PictureInfo.cs b/src/Ryujinx.Graphics.Nvdec/Types/Vp8/PictureInfo.cs
index 844f2103..76e07a3f 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/Vp8/PictureInfo.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/Vp8/PictureInfo.cs
@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp8
{
struct PictureInfo
{
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
public Array13<uint> Unknown0;
public uint GpTimerTimeoutValue;
public ushort FrameWidth;
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/EntropyProbs.cs b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/EntropyProbs.cs
index b2858d2d..dd5221b1 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/EntropyProbs.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/EntropyProbs.cs
@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
{
struct EntropyProbs
{
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
public Array10<Array10<Array8<byte>>> KfYModeProbE0ToE7;
public Array10<Array10<byte>> KfYModeProbE8;
public Array3<byte> Padding384;
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameSize.cs b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameSize.cs
index d449ec4d..31c08a52 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameSize.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameSize.cs
@@ -2,7 +2,7 @@
{
struct FrameSize
{
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
public ushort Width;
public ushort Height;
public ushort LumaPitch;
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameStats.cs b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameStats.cs
index 26aab506..9b0325cf 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameStats.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameStats.cs
@@ -2,7 +2,7 @@
{
struct FrameStats
{
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
public uint Unknown0;
public uint Unknown4;
public uint Pass2CycleCount;
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/LoopFilter.cs b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/LoopFilter.cs
index 7cb0fd7a..ebef7f67 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/LoopFilter.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/LoopFilter.cs
@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
{
struct LoopFilter
{
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
public byte ModeRefDeltaEnabled;
public Array4<sbyte> RefDeltas;
public Array2<sbyte> ModeDeltas;
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs
index 7d06f747..50569dbf 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs
@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
{
struct PictureInfo
{
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
public Array12<uint> Unknown0;
public uint BitstreamSize;
public uint IsEncrypted;
@@ -44,7 +44,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
public uint UnknownFC;
#pragma warning restore CS0649
- public uint BitDepth => (SurfaceParams >> 1) & 0xf;
+ public readonly uint BitDepth => (SurfaceParams >> 1) & 0xf;
public Vp9PictureInfo Convert()
{
diff --git a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/Segmentation.cs b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/Segmentation.cs
index f6c4f0b1..ab9954c6 100644
--- a/src/Ryujinx.Graphics.Nvdec/Types/Vp9/Segmentation.cs
+++ b/src/Ryujinx.Graphics.Nvdec/Types/Vp9/Segmentation.cs
@@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
{
struct Segmentation
{
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
public byte Enabled;
public byte UpdateMap;
public byte TemporalUpdate;