aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Audio/Renderer/Common
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-07-02 01:27:18 +0200
committerGitHub <noreply@github.com>2023-07-02 01:27:18 +0200
commit515fc32b21f59298ec8ca45f5d3c36e9d3041084 (patch)
treeac3683b0bc6b6be56e6e4bdf7e37cea0e64a3fd0 /src/Ryujinx.Audio/Renderer/Common
parent0684b00b3c4d000cf627b9c08a49d7469ae50d04 (diff)
[Ryujinx.Audio] Address dotnet-format issues (#5362)
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA2211 warnings * Address review comments * 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 * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Address IDE0251 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * Fix naming rule violations, remove redundant code and fix build issues * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Add trailing commas * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Address review feedback --------- Co-authored-by: Ac_K <Acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.Audio/Renderer/Common')
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/AuxiliaryBufferAddresses.cs2
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/BehaviourParameter.cs6
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/EdgeMatrix.cs2
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/EffectType.cs2
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/MemoryPoolUserState.cs4
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/NodeIdHelper.cs2
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/NodeIdType.cs4
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/NodeStates.cs25
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/PerformanceDetailType.cs4
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/PerformanceEntryType.cs4
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/PlayState.cs4
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/ReverbEarlyMode.cs4
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/ReverbLateMode.cs4
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/SinkType.cs4
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/UpdateDataHeader.cs7
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/VoiceUpdateState.cs2
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/WaveBuffer.cs5
-rw-r--r--src/Ryujinx.Audio/Renderer/Common/WorkBufferAllocator.cs8
18 files changed, 48 insertions, 45 deletions
diff --git a/src/Ryujinx.Audio/Renderer/Common/AuxiliaryBufferAddresses.cs b/src/Ryujinx.Audio/Renderer/Common/AuxiliaryBufferAddresses.cs
index 96647405..b7b97d5d 100644
--- a/src/Ryujinx.Audio/Renderer/Common/AuxiliaryBufferAddresses.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/AuxiliaryBufferAddresses.cs
@@ -10,4 +10,4 @@ namespace Ryujinx.Audio.Renderer.Common
public ulong ReturnBufferInfo;
public ulong ReturnBufferInfoBase;
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/BehaviourParameter.cs b/src/Ryujinx.Audio/Renderer/Common/BehaviourParameter.cs
index 270f84d5..b0963c93 100644
--- a/src/Ryujinx.Audio/Renderer/Common/BehaviourParameter.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/BehaviourParameter.cs
@@ -16,7 +16,7 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// Reserved/padding.
/// </summary>
- private uint _padding;
+ private readonly uint _padding;
/// <summary>
/// The flags given controlling behaviour of the audio renderer
@@ -38,7 +38,7 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// Reserved/padding.
/// </summary>
- private uint _padding;
+ private readonly uint _padding;
/// <summary>
/// Extra information given with the <see cref="ResultCode"/>
@@ -47,4 +47,4 @@ namespace Ryujinx.Audio.Renderer.Common
public ulong ExtraErrorInfo;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/EdgeMatrix.cs b/src/Ryujinx.Audio/Renderer/Common/EdgeMatrix.cs
index 24a9350f..3beb6239 100644
--- a/src/Ryujinx.Audio/Renderer/Common/EdgeMatrix.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/EdgeMatrix.cs
@@ -147,4 +147,4 @@ namespace Ryujinx.Audio.Renderer.Common
return _nodeCount;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/EffectType.cs b/src/Ryujinx.Audio/Renderer/Common/EffectType.cs
index 7128db4c..7c8713b1 100644
--- a/src/Ryujinx.Audio/Renderer/Common/EffectType.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/EffectType.cs
@@ -55,4 +55,4 @@ namespace Ryujinx.Audio.Renderer.Common
/// </summary>
Compressor,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/MemoryPoolUserState.cs b/src/Ryujinx.Audio/Renderer/Common/MemoryPoolUserState.cs
index 590731c3..6d835879 100644
--- a/src/Ryujinx.Audio/Renderer/Common/MemoryPoolUserState.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/MemoryPoolUserState.cs
@@ -38,6 +38,6 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// The memory pool is released. (client side only)
/// </summary>
- Released = 6
+ Released = 6,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/NodeIdHelper.cs b/src/Ryujinx.Audio/Renderer/Common/NodeIdHelper.cs
index a999e3ad..76fba54b 100644
--- a/src/Ryujinx.Audio/Renderer/Common/NodeIdHelper.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/NodeIdHelper.cs
@@ -25,4 +25,4 @@ namespace Ryujinx.Audio.Renderer.Common
return (nodeId >> 16) & 0xFFF;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/NodeIdType.cs b/src/Ryujinx.Audio/Renderer/Common/NodeIdType.cs
index 69b58f6b..b226da14 100644
--- a/src/Ryujinx.Audio/Renderer/Common/NodeIdType.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/NodeIdType.cs
@@ -28,6 +28,6 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// Performance monitoring related node id (performance commands)
/// </summary>
- Performance = 15
+ Performance = 15,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/NodeStates.cs b/src/Ryujinx.Audio/Renderer/Common/NodeStates.cs
index 45748d60..75290a74 100644
--- a/src/Ryujinx.Audio/Renderer/Common/NodeStates.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/NodeStates.cs
@@ -53,17 +53,17 @@ namespace Ryujinx.Audio.Renderer.Common
}
private int _nodeCount;
- private EdgeMatrix _discovered;
- private EdgeMatrix _finished;
+ private readonly EdgeMatrix _discovered;
+ private readonly EdgeMatrix _finished;
private Memory<int> _resultArray;
- private Stack _stack;
+ private readonly Stack _stack;
private int _tsortResultIndex;
private enum NodeState : byte
{
Unknown,
Discovered,
- Finished
+ Finished,
}
public NodeStates()
@@ -88,16 +88,16 @@ namespace Ryujinx.Audio.Renderer.Common
int edgeMatrixWorkBufferSize = EdgeMatrix.GetWorkBufferSize(nodeCount);
- _discovered.Initialize(nodeStatesWorkBuffer.Slice(0, edgeMatrixWorkBufferSize), nodeCount);
+ _discovered.Initialize(nodeStatesWorkBuffer[..edgeMatrixWorkBufferSize], nodeCount);
_finished.Initialize(nodeStatesWorkBuffer.Slice(edgeMatrixWorkBufferSize, edgeMatrixWorkBufferSize), nodeCount);
- nodeStatesWorkBuffer = nodeStatesWorkBuffer.Slice(edgeMatrixWorkBufferSize * 2);
+ nodeStatesWorkBuffer = nodeStatesWorkBuffer[(edgeMatrixWorkBufferSize * 2)..];
- _resultArray = SpanMemoryManager<int>.Cast(nodeStatesWorkBuffer.Slice(0, sizeof(int) * nodeCount));
+ _resultArray = SpanMemoryManager<int>.Cast(nodeStatesWorkBuffer[..(sizeof(int) * nodeCount)]);
- nodeStatesWorkBuffer = nodeStatesWorkBuffer.Slice(sizeof(int) * nodeCount);
+ nodeStatesWorkBuffer = nodeStatesWorkBuffer[(sizeof(int) * nodeCount)..];
- Memory<int> stackWorkBuffer = SpanMemoryManager<int>.Cast(nodeStatesWorkBuffer.Slice(0, Stack.CalcBufferSize(nodeCount * nodeCount)));
+ Memory<int> stackWorkBuffer = SpanMemoryManager<int>.Cast(nodeStatesWorkBuffer[..Stack.CalcBufferSize(nodeCount * nodeCount)]);
_stack.Reset(stackWorkBuffer, nodeCount * nodeCount);
}
@@ -120,7 +120,8 @@ namespace Ryujinx.Audio.Renderer.Common
return NodeState.Discovered;
}
- else if (_finished.Test(index))
+
+ if (_finished.Test(index))
{
Debug.Assert(!_discovered.Test(index));
@@ -158,7 +159,7 @@ namespace Ryujinx.Audio.Renderer.Common
public ReadOnlySpan<int> GetTsortResult()
{
- return _resultArray.Span.Slice(0, _tsortResultIndex);
+ return _resultArray.Span[.._tsortResultIndex];
}
public bool Sort(EdgeMatrix edgeMatrix)
@@ -226,4 +227,4 @@ namespace Ryujinx.Audio.Renderer.Common
return true;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/PerformanceDetailType.cs b/src/Ryujinx.Audio/Renderer/Common/PerformanceDetailType.cs
index 805d5518..bde32a70 100644
--- a/src/Ryujinx.Audio/Renderer/Common/PerformanceDetailType.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/PerformanceDetailType.cs
@@ -15,6 +15,6 @@ namespace Ryujinx.Audio.Renderer.Common
PcmFloat,
Limiter,
CaptureBuffer,
- Compressor
+ Compressor,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/PerformanceEntryType.cs b/src/Ryujinx.Audio/Renderer/Common/PerformanceEntryType.cs
index bde72aae..e32095e6 100644
--- a/src/Ryujinx.Audio/Renderer/Common/PerformanceEntryType.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/PerformanceEntryType.cs
@@ -6,6 +6,6 @@ namespace Ryujinx.Audio.Renderer.Common
Voice,
SubMix,
FinalMix,
- Sink
+ Sink,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/PlayState.cs b/src/Ryujinx.Audio/Renderer/Common/PlayState.cs
index 4a6929e0..a83d16af 100644
--- a/src/Ryujinx.Audio/Renderer/Common/PlayState.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/PlayState.cs
@@ -18,6 +18,6 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// The user request the voice to be paused.
/// </summary>
- Pause
+ Pause,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/ReverbEarlyMode.cs b/src/Ryujinx.Audio/Renderer/Common/ReverbEarlyMode.cs
index aa768562..c7443cc4 100644
--- a/src/Ryujinx.Audio/Renderer/Common/ReverbEarlyMode.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/ReverbEarlyMode.cs
@@ -28,6 +28,6 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// No early reflection.
/// </summary>
- Disabled
+ Disabled,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/ReverbLateMode.cs b/src/Ryujinx.Audio/Renderer/Common/ReverbLateMode.cs
index 8aa88165..78f91cf0 100644
--- a/src/Ryujinx.Audio/Renderer/Common/ReverbLateMode.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/ReverbLateMode.cs
@@ -33,6 +33,6 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// Max delay. (used for delay line limits)
/// </summary>
- Limit = NoDelay
+ Limit = NoDelay,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/SinkType.cs b/src/Ryujinx.Audio/Renderer/Common/SinkType.cs
index 2e17201e..5a08df4e 100644
--- a/src/Ryujinx.Audio/Renderer/Common/SinkType.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/SinkType.cs
@@ -18,6 +18,6 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// The sink is a circular buffer.
/// </summary>
- CircularBuffer
+ CircularBuffer,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/UpdateDataHeader.cs b/src/Ryujinx.Audio/Renderer/Common/UpdateDataHeader.cs
index 70dbfa94..7efe3b02 100644
--- a/src/Ryujinx.Audio/Renderer/Common/UpdateDataHeader.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/UpdateDataHeader.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Common.Memory;
using System.Runtime.CompilerServices;
namespace Ryujinx.Audio.Renderer.Common
@@ -19,7 +20,9 @@ namespace Ryujinx.Audio.Renderer.Common
public uint Unknown24;
public uint RenderInfoSize;
- private unsafe fixed int _reserved[4];
+#pragma warning disable IDE0051, CS0169 // Remove unused field
+ private Array4<int> _reserved;
+#pragma warning restore IDE0051, CS0169
public uint TotalSize;
@@ -30,4 +33,4 @@ namespace Ryujinx.Audio.Renderer.Common
TotalSize = (uint)Unsafe.SizeOf<UpdateDataHeader>();
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/VoiceUpdateState.cs b/src/Ryujinx.Audio/Renderer/Common/VoiceUpdateState.cs
index f52c2f4c..608381af 100644
--- a/src/Ryujinx.Audio/Renderer/Common/VoiceUpdateState.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/VoiceUpdateState.cs
@@ -101,4 +101,4 @@ namespace Ryujinx.Audio.Renderer.Common
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/WaveBuffer.cs b/src/Ryujinx.Audio/Renderer/Common/WaveBuffer.cs
index 0d00e838..5109d3fa 100644
--- a/src/Ryujinx.Audio/Renderer/Common/WaveBuffer.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/WaveBuffer.cs
@@ -1,5 +1,4 @@
using System.Runtime.InteropServices;
-
using DspAddr = System.UInt64;
namespace Ryujinx.Audio.Renderer.Common
@@ -77,6 +76,6 @@ namespace Ryujinx.Audio.Renderer.Common
/// <summary>
/// Padding/Reserved.
/// </summary>
- private ushort _padding;
+ private readonly ushort _padding;
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Audio/Renderer/Common/WorkBufferAllocator.cs b/src/Ryujinx.Audio/Renderer/Common/WorkBufferAllocator.cs
index f35dbec7..54673f2f 100644
--- a/src/Ryujinx.Audio/Renderer/Common/WorkBufferAllocator.cs
+++ b/src/Ryujinx.Audio/Renderer/Common/WorkBufferAllocator.cs
@@ -23,7 +23,7 @@ namespace Ryujinx.Audio.Renderer.Common
if (size != 0)
{
- ulong alignedOffset = BitUtils.AlignUp<ulong>(Offset, (ulong)align);
+ ulong alignedOffset = BitUtils.AlignUp(Offset, (ulong)align);
if (alignedOffset + size <= (ulong)BackingMemory.Length)
{
@@ -32,7 +32,7 @@ namespace Ryujinx.Audio.Renderer.Common
Offset = alignedOffset + size;
// Clear the memory to be sure that is does not contain any garbage.
- result.Span.Fill(0);
+ result.Span.Clear();
return result;
}
@@ -55,7 +55,7 @@ namespace Ryujinx.Audio.Renderer.Common
public static ulong GetTargetSize<T>(ulong currentSize, ulong count, int align) where T : unmanaged
{
- return BitUtils.AlignUp<ulong>(currentSize, (ulong)align) + (ulong)Unsafe.SizeOf<T>() * count;
+ return BitUtils.AlignUp(currentSize, (ulong)align) + (ulong)Unsafe.SizeOf<T>() * count;
}
}
-} \ No newline at end of file
+}