aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-07-01 12:31:42 +0200
committerGitHub <noreply@github.com>2023-07-01 12:31:42 +0200
commit801b71a12883f8a104c699a92a9aa997e2a6d609 (patch)
tree65a93c437abe7f598726e2654103ebfa0e62f477 /src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs
parent12c5f6ee89a2e93814d144a2c92acbf3f8a4788f (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/MemoryAllocatorBlockList.cs')
-rw-r--r--src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs b/src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs
index e564cb26..bd57e778 100644
--- a/src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs
+++ b/src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs
@@ -43,7 +43,7 @@ namespace Ryujinx.Graphics.Vulkan
Size = size;
_freeRanges = new List<Range>
{
- new Range(0, size)
+ new Range(0, size),
};
}
@@ -53,7 +53,7 @@ namespace Ryujinx.Graphics.Vulkan
{
var range = _freeRanges[i];
- ulong alignedOffset = BitUtils.AlignUp<ulong>(range.Offset, alignment);
+ ulong alignedOffset = BitUtils.AlignUp(range.Offset, alignment);
ulong sizeDelta = alignedOffset - range.Offset;
ulong usableSize = range.Size - sizeDelta;
@@ -198,13 +198,13 @@ namespace Ryujinx.Graphics.Vulkan
}
}
- ulong blockAlignedSize = BitUtils.AlignUp<ulong>(size, (ulong)_blockAlignment);
+ ulong blockAlignedSize = BitUtils.AlignUp(size, (ulong)_blockAlignment);
- var memoryAllocateInfo = new MemoryAllocateInfo()
+ var memoryAllocateInfo = new MemoryAllocateInfo
{
SType = StructureType.MemoryAllocateInfo,
AllocationSize = blockAlignedSize,
- MemoryTypeIndex = (uint)MemoryTypeIndex
+ MemoryTypeIndex = (uint)MemoryTypeIndex,
};
_api.AllocateMemory(_device, memoryAllocateInfo, null, out var deviceMemory).ThrowOnError();
@@ -213,12 +213,9 @@ namespace Ryujinx.Graphics.Vulkan
if (map)
{
- unsafe
- {
- void* pointer = null;
- _api.MapMemory(_device, deviceMemory, 0, blockAlignedSize, 0, ref pointer).ThrowOnError();
- hostPointer = (IntPtr)pointer;
- }
+ void* pointer = null;
+ _api.MapMemory(_device, deviceMemory, 0, blockAlignedSize, 0, ref pointer).ThrowOnError();
+ hostPointer = (IntPtr)pointer;
}
var newBlock = new Block(deviceMemory, hostPointer, blockAlignedSize);
@@ -238,10 +235,10 @@ namespace Ryujinx.Graphics.Vulkan
return IntPtr.Zero;
}
- return (IntPtr)((nuint)(nint)block.HostPointer + offset);
+ return (IntPtr)((nuint)block.HostPointer + offset);
}
- public unsafe void Free(Block block, ulong offset, ulong size)
+ public void Free(Block block, ulong offset, ulong size)
{
block.Free(offset, size);
@@ -271,7 +268,7 @@ namespace Ryujinx.Graphics.Vulkan
_blocks.Insert(index, block);
}
- public unsafe void Dispose()
+ public void Dispose()
{
for (int i = 0; i < _blocks.Count; i++)
{