diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-06-28 18:46:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 18:46:18 +0200 |
| commit | cebfa54467231f0d1ca43021608b8b1ab03f39fb (patch) | |
| tree | 25a2e776ca31ea9e92c8e389d852e7ce95946e14 /src/Ryujinx.Graphics.Texture/LayoutConverter.cs | |
| parent | fc20d9b925b83532a19467293a7cdcbaa4ef3d6b (diff) | |
[Ryujinx.Graphics.Texture] Address dotnet-format issues (#5375)1.1.937
* dotnet format style --severity info
Some changes were manually reverted.
* Restore a few unused methods and variables
* Silence dotnet format IDE0060 warnings
* Silence dotnet format IDE0059 warnings
* Address or silence dotnet format CA2208 warnings
* 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
* Add comments to disabled warnings
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* 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 dotnet format pass
* Apply suggestions from code review
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Address review feedback
* Update src/Ryujinx.Graphics.Texture/Astc/AstcDecoder.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
---------
Co-authored-by: Ac_K <Acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.Graphics.Texture/LayoutConverter.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Texture/LayoutConverter.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/Ryujinx.Graphics.Texture/LayoutConverter.cs b/src/Ryujinx.Graphics.Texture/LayoutConverter.cs index 503985c9..0f7c304e 100644 --- a/src/Ryujinx.Graphics.Texture/LayoutConverter.cs +++ b/src/Ryujinx.Graphics.Texture/LayoutConverter.cs @@ -31,7 +31,7 @@ namespace Ryujinx.Graphics.Texture int wAligned = BitUtils.AlignUp(width, alignment); - BlockLinearLayout layoutConverter = new BlockLinearLayout(wAligned, height, gobBlocksInY, 1, bytesPerPixel); + BlockLinearLayout layoutConverter = new(wAligned, height, gobBlocksInY, 1, bytesPerPixel); unsafe bool Convert<T>(Span<byte> output, ReadOnlySpan<byte> data) where T : unmanaged { @@ -126,14 +126,14 @@ namespace Ryujinx.Graphics.Texture int mipGobBlocksInY = gobBlocksInY; int mipGobBlocksInZ = gobBlocksInZ; - int gobWidth = (GobStride / bytesPerPixel) * gobBlocksInTileX; + int gobWidth = (GobStride / bytesPerPixel) * gobBlocksInTileX; int gobHeight = gobBlocksInY * GobHeight; for (int level = 0; level < levels; level++) { - int w = Math.Max(1, width >> level); + int w = Math.Max(1, width >> level); int h = Math.Max(1, height >> level); - int d = Math.Max(1, depth >> level); + int d = Math.Max(1, depth >> level); w = BitUtils.DivRoundUp(w, blockWidth); h = BitUtils.DivRoundUp(h, blockHeight); @@ -166,7 +166,7 @@ namespace Ryujinx.Graphics.Texture int wAligned = BitUtils.AlignUp(w, alignment); - BlockLinearLayout layoutConverter = new BlockLinearLayout( + BlockLinearLayout layoutConverter = new( wAligned, h, mipGobBlocksInY, @@ -256,7 +256,7 @@ namespace Ryujinx.Graphics.Texture int bytesPerPixel, ReadOnlySpan<byte> data) { - int w = BitUtils.DivRoundUp(width, blockWidth); + int w = BitUtils.DivRoundUp(width, blockWidth); int h = BitUtils.DivRoundUp(height, blockHeight); int outStride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment); @@ -301,7 +301,7 @@ namespace Ryujinx.Graphics.Texture int wAligned = BitUtils.AlignUp(width, alignment); - BlockLinearLayout layoutConverter = new BlockLinearLayout(wAligned, height, gobBlocksInY, 1, bytesPerPixel); + BlockLinearLayout layoutConverter = new(wAligned, height, gobBlocksInY, 1, bytesPerPixel); unsafe bool Convert<T>(Span<byte> output, ReadOnlySpan<byte> data) where T : unmanaged { @@ -390,14 +390,14 @@ namespace Ryujinx.Graphics.Texture int mipGobBlocksInY = gobBlocksInY; int mipGobBlocksInZ = gobBlocksInZ; - int gobWidth = (GobStride / bytesPerPixel) * gobBlocksInTileX; + int gobWidth = (GobStride / bytesPerPixel) * gobBlocksInTileX; int gobHeight = gobBlocksInY * GobHeight; for (int level = 0; level < levels; level++) { - int w = Math.Max(1, width >> level); + int w = Math.Max(1, width >> level); int h = Math.Max(1, height >> level); - int d = Math.Max(1, depth >> level); + int d = Math.Max(1, depth >> level); w = BitUtils.DivRoundUp(w, blockWidth); h = BitUtils.DivRoundUp(h, blockHeight); @@ -430,7 +430,7 @@ namespace Ryujinx.Graphics.Texture int wAligned = BitUtils.AlignUp(w, alignment); - BlockLinearLayout layoutConverter = new BlockLinearLayout( + BlockLinearLayout layoutConverter = new( wAligned, h, mipGobBlocksInY, @@ -521,7 +521,7 @@ namespace Ryujinx.Graphics.Texture int bytesPerPixel, ReadOnlySpan<byte> data) { - int w = BitUtils.DivRoundUp(width, blockWidth); + int w = BitUtils.DivRoundUp(width, blockWidth); int h = BitUtils.DivRoundUp(height, blockHeight); int inStride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment); @@ -573,9 +573,9 @@ namespace Ryujinx.Graphics.Texture for (int level = 0; level < levels; level++) { - int w = Math.Max(1, width >> level); + int w = Math.Max(1, width >> level); int h = Math.Max(1, height >> level); - int d = Math.Max(1, depth >> level); + int d = Math.Max(1, depth >> level); w = BitUtils.DivRoundUp(w, blockWidth); h = BitUtils.DivRoundUp(h, blockHeight); @@ -588,4 +588,4 @@ namespace Ryujinx.Graphics.Texture return layerSize * layers; } } -}
\ No newline at end of file +} |