diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2023-05-08 11:45:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-08 12:45:12 +0200 |
| commit | 1b28ecd63eb49917e3711eb7e06739ebe87e8f41 (patch) | |
| tree | 4259bbedb1fc4d2ae9f4e0dbac30d42c41d6ddc9 /src/Ryujinx.Graphics.Vulkan/PersistentFlushBuffer.cs | |
| parent | 895d9b53bc37507fed6829a7f91a1b8e3237ab0b (diff) | |
Vulkan: Simplify MultiFenceHolder and managing them (#4845)1.1.770
* Vulkan: Simplify waitable add/remove
Removal of unnecessary hashset and dictionary
* Thread safety for GetBufferData in PersistentFlushBuffer
* Fix WaitForFencesImpl thread safety
* Proper methods for risky reference increments
* Wrong type of CB.
* Address feedback
Diffstat (limited to 'src/Ryujinx.Graphics.Vulkan/PersistentFlushBuffer.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Vulkan/PersistentFlushBuffer.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/Ryujinx.Graphics.Vulkan/PersistentFlushBuffer.cs b/src/Ryujinx.Graphics.Vulkan/PersistentFlushBuffer.cs index fca13c31..fc98b68f 100644 --- a/src/Ryujinx.Graphics.Vulkan/PersistentFlushBuffer.cs +++ b/src/Ryujinx.Graphics.Vulkan/PersistentFlushBuffer.cs @@ -34,16 +34,26 @@ namespace Ryujinx.Graphics.Vulkan public Span<byte> GetBufferData(CommandBufferPool cbp, BufferHolder buffer, int offset, int size) { var flushStorage = ResizeIfNeeded(size); + Auto<DisposableBuffer> srcBuffer; using (var cbs = cbp.Rent()) { - var srcBuffer = buffer.GetBuffer(cbs.CommandBuffer); + srcBuffer = buffer.GetBuffer(cbs.CommandBuffer); var dstBuffer = flushStorage.GetBuffer(cbs.CommandBuffer); - BufferHolder.Copy(_gd, cbs, srcBuffer, dstBuffer, offset, 0, size); + if (srcBuffer.TryIncrementReferenceCount()) + { + BufferHolder.Copy(_gd, cbs, srcBuffer, dstBuffer, offset, 0, size, registerSrcUsage: false); + } + else + { + // Source buffer is no longer alive, don't copy anything to flush storage. + srcBuffer = null; + } } flushStorage.WaitForFences(); + srcBuffer?.DecrementReferenceCount(); return flushStorage.GetDataStorage(0, size); } |