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/ShaderSpecializationState.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/ShaderSpecializationState.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs b/src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs index 9b0c8b9b..775bfb2a 100644 --- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs +++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs @@ -31,7 +31,7 @@ namespace Ryujinx.Graphics.Gpu.Shader EarlyZForce = 1 << 0, PrimitiveTopology = 1 << 1, TessellationMode = 1 << 2, - TransformFeedback = 1 << 3 + TransformFeedback = 1 << 3, } private QueriedStateFlags _queriedState; @@ -71,7 +71,7 @@ namespace Ryujinx.Graphics.Gpu.Shader { TextureFormat = 1 << 0, SamplerType = 1 << 1, - CoordNormalized = 1 << 2 + CoordNormalized = 1 << 2, } /// <summary> @@ -440,7 +440,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// <returns>Texture specialization state</returns> private Box<TextureSpecializationState> GetOrCreateTextureSpecState(int stageIndex, int handle, int cbufSlot) { - TextureKey key = new TextureKey(stageIndex, handle, cbufSlot); + TextureKey key = new(stageIndex, handle, cbufSlot); if (!_textureSpecialization.TryGetValue(key, out Box<TextureSpecializationState> state)) { @@ -459,7 +459,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// <returns>Texture specialization state</returns> private Box<TextureSpecializationState> GetTextureSpecState(int stageIndex, int handle, int cbufSlot) { - TextureKey key = new TextureKey(stageIndex, handle, cbufSlot); + TextureKey key = new(stageIndex, handle, cbufSlot); if (_textureSpecialization.TryGetValue(key, out Box<TextureSpecializationState> state)) { @@ -694,7 +694,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// <param name="descriptor">Texture descriptor</param> /// <returns>True if the state matches, false otherwise</returns> [MethodImpl(MethodImplOptions.AggressiveInlining)] - private bool MatchesTexture(Box<TextureSpecializationState> specializationState, in Image.TextureDescriptor descriptor) + private static bool MatchesTexture(Box<TextureSpecializationState> specializationState, in Image.TextureDescriptor descriptor) { if (specializationState != null) { @@ -756,7 +756,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// <returns>Shader specialization state</returns> public static ShaderSpecializationState Read(ref BinarySerializer dataReader) { - ShaderSpecializationState specState = new ShaderSpecializationState(); + ShaderSpecializationState specState = new(); dataReader.Read(ref specState._queriedState); dataReader.Read(ref specState._compute); @@ -812,7 +812,7 @@ namespace Ryujinx.Graphics.Gpu.Shader for (int index = 0; index < count; index++) { TextureKey textureKey = default; - Box<TextureSpecializationState> textureState = new Box<TextureSpecializationState>(); + Box<TextureSpecializationState> textureState = new(); dataReader.ReadWithMagicAndSize(ref textureKey, TexkMagic); dataReader.ReadWithMagicAndSize(ref textureState.Value, TexsMagic); @@ -886,4 +886,4 @@ namespace Ryujinx.Graphics.Gpu.Shader } } } -}
\ No newline at end of file +} |