diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2023-03-19 20:56:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-19 17:56:48 -0300 |
| commit | 9f1cf6458c78a42256b1f390f5b3b9159b00a7cb (patch) | |
| tree | 21e250d28c0fd611de0515fc19a381d4bebc6136 /Ryujinx.Graphics.Vulkan/MemoryAllocator.cs | |
| parent | 67b4e63cff0d6ce9629c3032f2b0d6414cee1220 (diff) | |
Vulkan: Migrate buffers between memory types to improve GPU performance (#4540)1.1.672
* Initial implementation of migration between memory heaps
- Missing OOM handling
- Missing `_map` data safety when remapping
- Copy may not have completed yet (needs some kind of fence)
- Map may be unmapped before it is done being used. (needs scoped access)
- SSBO accesses are all "writes" - maybe pass info in another way.
- Missing keeping map type when resizing buffers (should this be done?)
* Ensure migrated data is in place before flushing.
* Fix issue where old waitable would be signalled.
- There is a real issue where existing Auto<> references need to be replaced.
* Swap bound Auto<> instances when swapping buffer backing
* Fix conversion buffers
* Don't try move buffers if the host has shared memory.
* Make GPU methods return PinnedSpan with scope
* Storage Hint
* Fix stupidity
* Fix rebase
* Tweak rules
Attempt to sidestep BOTW slowdown
* Remove line
* Migrate only when command buffers flush
* Change backing swap log to debug
* Address some feedback
* Disallow backing swap when the flush lock is held by the current thread
* Make PinnedSpan from ReadOnlySpan explicitly unsafe
* Fix some small issues
- Index buffer swap fixed
- Allocate DeviceLocal buffers using a separate block list to images.
* Remove alternative flags
* Address feedback
Diffstat (limited to 'Ryujinx.Graphics.Vulkan/MemoryAllocator.cs')
| -rw-r--r-- | Ryujinx.Graphics.Vulkan/MemoryAllocator.cs | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs b/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs index e4dcd916..6a786a96 100644 --- a/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs +++ b/Ryujinx.Graphics.Vulkan/MemoryAllocator.cs @@ -28,32 +28,25 @@ namespace Ryujinx.Graphics.Vulkan public MemoryAllocation AllocateDeviceMemory( MemoryRequirements requirements, - MemoryPropertyFlags flags = 0) + MemoryPropertyFlags flags = 0, + bool isBuffer = false) { - return AllocateDeviceMemory(requirements, flags, flags); - } - - public MemoryAllocation AllocateDeviceMemory( - MemoryRequirements requirements, - MemoryPropertyFlags flags, - MemoryPropertyFlags alternativeFlags) - { - int memoryTypeIndex = FindSuitableMemoryTypeIndex(requirements.MemoryTypeBits, flags, alternativeFlags); + int memoryTypeIndex = FindSuitableMemoryTypeIndex(requirements.MemoryTypeBits, flags); if (memoryTypeIndex < 0) { return default; } bool map = flags.HasFlag(MemoryPropertyFlags.HostVisibleBit); - return Allocate(memoryTypeIndex, requirements.Size, requirements.Alignment, map); + return Allocate(memoryTypeIndex, requirements.Size, requirements.Alignment, map, isBuffer); } - private MemoryAllocation Allocate(int memoryTypeIndex, ulong size, ulong alignment, bool map) + private MemoryAllocation Allocate(int memoryTypeIndex, ulong size, ulong alignment, bool map, bool isBuffer) { for (int i = 0; i < _blockLists.Count; i++) { var bl = _blockLists[i]; - if (bl.MemoryTypeIndex == memoryTypeIndex) + if (bl.MemoryTypeIndex == memoryTypeIndex && bl.ForBuffer == isBuffer) { lock (bl) { @@ -62,18 +55,15 @@ namespace Ryujinx.Graphics.Vulkan } } - var newBl = new MemoryAllocatorBlockList(_api, _device, memoryTypeIndex, _blockAlignment); + var newBl = new MemoryAllocatorBlockList(_api, _device, memoryTypeIndex, _blockAlignment, isBuffer); _blockLists.Add(newBl); return newBl.Allocate(size, alignment, map); } private int FindSuitableMemoryTypeIndex( uint memoryTypeBits, - MemoryPropertyFlags flags, - MemoryPropertyFlags alternativeFlags) + MemoryPropertyFlags flags) { - int bestCandidateIndex = -1; - for (int i = 0; i < _physicalDeviceMemoryProperties.MemoryTypeCount; i++) { var type = _physicalDeviceMemoryProperties.MemoryTypes[i]; @@ -84,14 +74,27 @@ namespace Ryujinx.Graphics.Vulkan { return i; } - else if (type.PropertyFlags.HasFlag(alternativeFlags)) - { - bestCandidateIndex = i; - } } } - return bestCandidateIndex; + return -1; + } + + public static bool IsDeviceMemoryShared(Vk api, PhysicalDevice physicalDevice) + { + // The device is regarded as having shared memory if all heaps have the device local bit. + + api.GetPhysicalDeviceMemoryProperties(physicalDevice, out var properties); + + for (int i = 0; i < properties.MemoryHeapCount; i++) + { + if (!properties.MemoryHeaps[i].Flags.HasFlag(MemoryHeapFlags.DeviceLocalBit)) + { + return false; + } + } + + return true; } public void Dispose() |