diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-07-02 02:47:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-02 02:47:54 +0200 |
| commit | 3b46bb73f781a011705ecbc8a1d3207dfb145829 (patch) | |
| tree | 1d5d2714c7001775b512bc14ce91a1ebbfc808df /src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs | |
| parent | 2457cfc9118a6ebb6008945c919edfd8b46af5e7 (diff) | |
[Ryujinx.Graphics.Gpu] Address dotnet-format issues (#5367)
* 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 CA1069 warnings
* Address or silence dotnet format CA2211 warnings
* Address remaining dotnet format analyzer 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 style after rebase
* Another rebase, another dotnet format run
* Run dotnet format style after rebase
* Run dotnet format after rebase and remove unused usings
- analyzers
- style
- whitespace
* Disable 'prefer switch expression' rule
* Add comments to disabled warnings
* Remove a few unused parameters
* Replace MmeShadowScratch with Array256<uint>
* 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
* Run dotnet format after rebase
* 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
* First pass of dotnet format
* Add unsafe dotnet format changes
* Fix typos
* Add trailing commas
* Disable formatting for FormatTable
* Address review feedback
Diffstat (limited to 'src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs b/src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs index dc5037c5..e27c14a1 100644 --- a/src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs +++ b/src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs @@ -62,7 +62,7 @@ namespace Ryujinx.Graphics.Gpu.Memory private int _sequenceNumber; - private bool _useGranular; + private readonly bool _useGranular; private bool _syncActionRegistered; private int _referenceCount = 1; @@ -80,10 +80,10 @@ namespace Ryujinx.Graphics.Gpu.Memory /// <param name="baseBuffers">Buffers which this buffer contains, and will inherit tracking handles from</param> public Buffer(GpuContext context, PhysicalMemory physicalMemory, ulong address, ulong size, IEnumerable<Buffer> baseBuffers = null) { - _context = context; + _context = context; _physicalMemory = physicalMemory; - Address = address; - Size = size; + Address = address; + Size = size; Handle = context.Renderer.CreateBuffer((int)size, baseBuffers?.MaxBy(x => x.Size).Handle ?? BufferHandle.Null); @@ -252,10 +252,7 @@ namespace Ryujinx.Graphics.Gpu.Memory /// </summary> private void EnsureRangeList() { - if (_modifiedRanges == null) - { - _modifiedRanges = new BufferModifiedRangeList(_context, this, Flush); - } + _modifiedRanges ??= new BufferModifiedRangeList(_context, this, Flush); } /// <summary> @@ -326,7 +323,7 @@ namespace Ryujinx.Graphics.Gpu.Memory _syncActionRegistered = true; } - Action<ulong, ulong> registerRangeAction = (ulong address, ulong size) => + void registerRangeAction(ulong address, ulong size) { if (_useGranular) { @@ -336,7 +333,7 @@ namespace Ryujinx.Graphics.Gpu.Memory { _memoryTracking.RegisterAction(_externalFlushDelegate); } - }; + } EnsureRangeList(); @@ -643,4 +640,4 @@ namespace Ryujinx.Graphics.Gpu.Memory DecrementReferenceCount(); } } -}
\ No newline at end of file +} |
