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/Shader/ShaderCacheHashTable.cs | |
| parent | 2457cfc9118a6ebb6008945c919edfd8b46af5e7 (diff) | |
[Ryujinx.Graphics.Gpu] Address dotnet-format issues (#5367)1.1.951
* 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/Shader/ShaderCacheHashTable.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Shader/ShaderCacheHashTable.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCacheHashTable.cs b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCacheHashTable.cs index e35c06b1..e65a1dec 100644 --- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCacheHashTable.cs +++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCacheHashTable.cs @@ -23,7 +23,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// </summary> /// <param name="stageIndex">Index of the shader stage</param> /// <returns>Guest code, or null if not present</returns> - public byte[] GetByIndex(int stageIndex) + public readonly byte[] GetByIndex(int stageIndex) { return stageIndex switch { @@ -31,7 +31,7 @@ namespace Ryujinx.Graphics.Gpu.Shader 2 => TessEvaluationCode, 3 => GeometryCode, 4 => FragmentCode, - _ => VertexBCode + _ => VertexBCode, }; } } @@ -85,7 +85,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// <param name="id">ID of the guest code, if found</param> /// <param name="data">Cached guest code, if found</param> /// <returns>True if found, false otherwise</returns> - public bool TryFind(IDataAccessor dataAccessor, out int id, out byte[] data) + public readonly bool TryFind(IDataAccessor dataAccessor, out int id, out byte[] data) { return _cache.TryFindItem(dataAccessor, out id, out data); } @@ -103,12 +103,12 @@ namespace Ryujinx.Graphics.Gpu.Shader public int GeometryId; public int FragmentId; - public override bool Equals(object obj) + public readonly override bool Equals(object obj) { return obj is IdTable other && Equals(other); } - public bool Equals(IdTable other) + public readonly bool Equals(IdTable other) { return other.VertexAId == VertexAId && other.VertexBId == VertexBId && @@ -118,7 +118,7 @@ namespace Ryujinx.Graphics.Gpu.Shader other.FragmentId == FragmentId; } - public override int GetHashCode() + public readonly override int GetHashCode() { return HashCode.Combine(VertexAId, VertexBId, TessControlId, TessEvaluationId, GeometryId, FragmentId); } @@ -154,7 +154,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// <param name="program">Program to be added</param> public void Add(CachedShaderProgram program) { - IdTable idTable = new IdTable(); + IdTable idTable = new(); foreach (var shader in program.Shaders) { @@ -222,7 +222,7 @@ namespace Ryujinx.Graphics.Gpu.Shader out CachedGraphicsGuestCode guestCode) { var memoryManager = channel.MemoryManager; - IdTable idTable = new IdTable(); + IdTable idTable = new(); guestCode = new CachedGraphicsGuestCode(); program = null; @@ -260,7 +260,7 @@ namespace Ryujinx.Graphics.Gpu.Shader return true; } - ShaderCodeAccessor codeAccessor = new ShaderCodeAccessor(memoryManager, baseAddress); + ShaderCodeAccessor codeAccessor = new(memoryManager, baseAddress); return idCache.TryFind(codeAccessor, out id, out data); } @@ -279,4 +279,4 @@ namespace Ryujinx.Graphics.Gpu.Shader } } } -}
\ No newline at end of file +} |