diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-07-01 12:31:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 12:31:42 +0200 |
| commit | 801b71a12883f8a104c699a92a9aa997e2a6d609 (patch) | |
| tree | 65a93c437abe7f598726e2654103ebfa0e62f477 /src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs | |
| parent | 12c5f6ee89a2e93814d144a2c92acbf3f8a4788f (diff) | |
[Ryujinx.Graphics.Vulkan] Address dotnet-format issues (#5378)
* 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 IDE0059 warnings
* Address dotnet format CA1816 warnings
* Fix new dotnet-format issues after rebase
* 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
* Another rebase, another dotnet format run
* Run dotnet format whitespace after rebase
* Run dotnet format style after rebase
* Run dotnet format analyzers after rebase
* 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
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* Run dotnet format after rebase
* Address IDE0251 warnings
* Address a few disabled IDE0060 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
* Fix naming rule violations
* Remove redundant code
* Rename generics
* Address review feedback
* Remove SetOrigin
Diffstat (limited to 'src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs b/src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs index 4e3c1dee..00fa6477 100644 --- a/src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs +++ b/src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs @@ -37,7 +37,7 @@ namespace Ryujinx.Graphics.Vulkan _freeSize = BufferSize; } - public unsafe void PushData(CommandBufferPool cbp, CommandBufferScoped? cbs, Action endRenderPass, BufferHolder dst, int dstOffset, ReadOnlySpan<byte> data) + public void PushData(CommandBufferPool cbp, CommandBufferScoped? cbs, Action endRenderPass, BufferHolder dst, int dstOffset, ReadOnlySpan<byte> data) { bool isRender = cbs != null; CommandBufferScoped scoped = cbs ?? cbp.Rent(); @@ -72,10 +72,10 @@ namespace Ryujinx.Graphics.Vulkan int chunkSize = Math.Min(_freeSize, data.Length); - PushDataImpl(scoped, dst, dstOffset, data.Slice(0, chunkSize)); + PushDataImpl(scoped, dst, dstOffset, data[..chunkSize]); dstOffset += chunkSize; - data = data.Slice(chunkSize); + data = data[chunkSize..]; } if (!isRender) @@ -93,8 +93,8 @@ namespace Ryujinx.Graphics.Vulkan int capacity = BufferSize - offset; if (capacity < data.Length) { - _buffer.SetDataUnchecked(offset, data.Slice(0, capacity)); - _buffer.SetDataUnchecked(0, data.Slice(capacity)); + _buffer.SetDataUnchecked(offset, data[..capacity]); + _buffer.SetDataUnchecked(0, data[capacity..]); BufferHolder.Copy(_gd, cbs, srcBuffer, dstBuffer, offset, dstOffset, capacity); BufferHolder.Copy(_gd, cbs, srcBuffer, dstBuffer, 0, dstOffset + capacity, data.Length - capacity); @@ -113,7 +113,7 @@ namespace Ryujinx.Graphics.Vulkan _pendingCopies.Enqueue(new PendingCopy(cbs.GetFence(), data.Length)); } - public unsafe bool TryPushData(CommandBufferScoped cbs, Action endRenderPass, BufferHolder dst, int dstOffset, ReadOnlySpan<byte> data) + public bool TryPushData(CommandBufferScoped cbs, Action endRenderPass, BufferHolder dst, int dstOffset, ReadOnlySpan<byte> data) { if (data.Length > BufferSize) { |
