diff options
Diffstat (limited to 'src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Vulkan/MemoryAllocatorBlockList.cs | 25 |
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++) { |