diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2022-10-08 15:28:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-08 11:28:27 -0300 |
| commit | 1ca0517c99af1914b887d6197b816c84537a9145 (patch) | |
| tree | ea0042b2bd1f178991142c8a7b0ad339488eb244 /Ryujinx.Graphics.Vulkan/CacheByRange.cs | |
| parent | 599d485bffc9080d1c54acce929bbda0c7077499 (diff) | |
Vulkan: Fix some issues with CacheByRange (#3743)1.1.296
* Fix some issues with CacheByRange
- Cache now clears under more circumstances, the most important being the fast path write.
- Cache supports partial clear which should help when more buffers join.
- Fixed an issue with I8->I16 conversion where it wouldn't register the buffer for use on dispose.
Should hopefully fix issues with https://github.com/Ryujinx/Ryujinx-Games-List/issues/4010 and maybe others.
* Fix collection modified exception
* Fix accidental use of parameterless constructor
* Replay DynamicState when restoring from helper shader
Diffstat (limited to 'Ryujinx.Graphics.Vulkan/CacheByRange.cs')
| -rw-r--r-- | Ryujinx.Graphics.Vulkan/CacheByRange.cs | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/Ryujinx.Graphics.Vulkan/CacheByRange.cs b/Ryujinx.Graphics.Vulkan/CacheByRange.cs index 4c47e1c1..c77e66ae 100644 --- a/Ryujinx.Graphics.Vulkan/CacheByRange.cs +++ b/Ryujinx.Graphics.Vulkan/CacheByRange.cs @@ -25,6 +25,11 @@ namespace Ryujinx.Graphics.Vulkan return other is I8ToI16CacheKey; } + public void SetBuffer(Auto<DisposableBuffer> buffer) + { + _buffer = buffer; + } + public void Dispose() { _gd.PipelineInternal.DirtyIndexBuffer(_buffer); @@ -160,6 +165,44 @@ namespace Ryujinx.Graphics.Vulkan } } + public void ClearRange(int offset, int size) + { + if (_ranges != null && _ranges.Count > 0) + { + int end = offset + size; + + List<ulong> toRemove = null; + + foreach (KeyValuePair<ulong, List<Entry>> range in _ranges) + { + (int rOffset, int rSize) = UnpackRange(range.Key); + + int rEnd = rOffset + rSize; + + if (rEnd > offset && rOffset < end) + { + List<Entry> entries = range.Value; + + foreach (Entry entry in entries) + { + entry.Key.Dispose(); + entry.Value.Dispose(); + } + + (toRemove ??= new List<ulong>()).Add(range.Key); + } + } + + if (toRemove != null) + { + foreach (ulong range in toRemove) + { + _ranges.Remove(range); + } + } + } + } + private List<Entry> GetEntries(int offset, int size) { if (_ranges == null) @@ -184,6 +227,11 @@ namespace Ryujinx.Graphics.Vulkan return (uint)offset | ((ulong)size << 32); } + private static (int offset, int size) UnpackRange(ulong range) + { + return ((int)range, (int)(range >> 32)); + } + public void Dispose() { Clear(); |