diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2022-09-09 00:30:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-08 20:30:19 -0300 |
| commit | c6d82209abeacd2336cde99e5a02b4596e70da83 (patch) | |
| tree | 8dc8e1055f402c07e6ed9e4ff247ca420729808c /Ryujinx.Graphics.Vulkan/BufferHolder.cs | |
| parent | ee1825219b8ccca13df7198d4e9ffb966e44c883 (diff) | |
Restride vertex buffer when stride causes attributes to misalign in Vulkan. (#3679)
* Vertex Buffer Alignment part 1
* Update CacheByRange
* Add Stride Change compute shader, fix storage buffers in helpers
* An AMD exclusive
* Reword
* Change rules - stride conversion when attrs misalign
* Fix stupid mistake
* Fix background pipeline compile
* Improve a few things.
* Fix some feedback
* Address Feedback
(the shader binary didn't change when i changed the source to use the subgroup size)
* Fix bug where rewritten buffer would be disposed instantly.
Diffstat (limited to 'Ryujinx.Graphics.Vulkan/BufferHolder.cs')
| -rw-r--r-- | Ryujinx.Graphics.Vulkan/BufferHolder.cs | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/Ryujinx.Graphics.Vulkan/BufferHolder.cs b/Ryujinx.Graphics.Vulkan/BufferHolder.cs index a366e4ac..a2fc0c39 100644 --- a/Ryujinx.Graphics.Vulkan/BufferHolder.cs +++ b/Ryujinx.Graphics.Vulkan/BufferHolder.cs @@ -27,7 +27,7 @@ namespace Ryujinx.Graphics.Vulkan private readonly Auto<MemoryAllocation> _allocationAuto; private readonly ulong _bufferHandle; - private CacheByRange<BufferHolder> _cachedConvertedIndexBuffers; + private CacheByRange<BufferHolder> _cachedConvertedBuffers; public int Size { get; } @@ -109,7 +109,7 @@ namespace Ryujinx.Graphics.Vulkan { if (isWrite) { - _cachedConvertedIndexBuffers.Clear(); + _cachedConvertedBuffers.Clear(); } return _buffer; @@ -364,13 +364,35 @@ namespace Ryujinx.Graphics.Vulkan public Auto<DisposableBuffer> GetBufferI8ToI16(CommandBufferScoped cbs, int offset, int size) { - if (!_cachedConvertedIndexBuffers.TryGetValue(offset, size, out var holder)) + var key = new I8ToI16CacheKey(); + + if (!_cachedConvertedBuffers.TryGetValue(offset, size, key, out var holder)) { holder = _gd.BufferManager.Create(_gd, (size * 2 + 3) & ~3); _gd.HelperShader.ConvertI8ToI16(_gd, cbs, this, holder, offset, size); - _cachedConvertedIndexBuffers.Add(offset, size, holder); + _cachedConvertedBuffers.Add(offset, size, key, holder); + } + + return holder.GetBuffer(); + } + + public Auto<DisposableBuffer> GetAlignedVertexBuffer(CommandBufferScoped cbs, int offset, int size, int stride, int alignment) + { + var key = new AlignedVertexBufferCacheKey(_gd, stride, alignment); + + if (!_cachedConvertedBuffers.TryGetValue(offset, size, key, out var holder)) + { + int alignedStride = (stride + (alignment - 1)) & -alignment; + + holder = _gd.BufferManager.Create(_gd, (size / stride) * alignedStride); + + _gd.HelperShader.ChangeStride(_gd, cbs, this, holder, offset, size, stride, alignedStride); + + key.SetBuffer(holder.GetBuffer()); + + _cachedConvertedBuffers.Add(offset, size, key, holder); } return holder.GetBuffer(); @@ -382,7 +404,7 @@ namespace Ryujinx.Graphics.Vulkan _buffer.Dispose(); _allocationAuto.Dispose(); - _cachedConvertedIndexBuffers.Dispose(); + _cachedConvertedBuffers.Dispose(); } } } |
