From 9f1cf6458c78a42256b1f390f5b3b9159b00a7cb Mon Sep 17 00:00:00 2001 From: riperiperi Date: Sun, 19 Mar 2023 20:56:48 +0000 Subject: Vulkan: Migrate buffers between memory types to improve GPU performance (#4540) * 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 --- Ryujinx.Graphics.OpenGL/Buffer.cs | 9 ++++++--- Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs | 4 ++-- Ryujinx.Graphics.OpenGL/Image/TextureView.cs | 10 +++++----- Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) (limited to 'Ryujinx.Graphics.OpenGL') diff --git a/Ryujinx.Graphics.OpenGL/Buffer.cs b/Ryujinx.Graphics.OpenGL/Buffer.cs index 68c82f95..af7d191a 100644 --- a/Ryujinx.Graphics.OpenGL/Buffer.cs +++ b/Ryujinx.Graphics.OpenGL/Buffer.cs @@ -55,11 +55,14 @@ namespace Ryujinx.Graphics.OpenGL (IntPtr)size); } - public static unsafe ReadOnlySpan GetData(OpenGLRenderer renderer, BufferHandle buffer, int offset, int size) + public static unsafe PinnedSpan GetData(OpenGLRenderer renderer, BufferHandle buffer, int offset, int size) { + // Data in the persistent buffer and host array is guaranteed to be available + // until the next time the host thread requests data. + if (HwCapabilities.UsePersistentBufferForFlush) { - return renderer.PersistentBuffers.Default.GetBufferData(buffer, offset, size); + return PinnedSpan.UnsafeFromSpan(renderer.PersistentBuffers.Default.GetBufferData(buffer, offset, size)); } else { @@ -69,7 +72,7 @@ namespace Ryujinx.Graphics.OpenGL GL.GetBufferSubData(BufferTarget.CopyReadBuffer, (IntPtr)offset, size, target); - return new ReadOnlySpan(target.ToPointer(), size); + return new PinnedSpan(target.ToPointer(), size); } } diff --git a/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs b/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs index 76d0149b..1e9e4d6b 100644 --- a/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs +++ b/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs @@ -39,12 +39,12 @@ namespace Ryujinx.Graphics.OpenGL.Image throw new NotSupportedException(); } - public ReadOnlySpan GetData() + public PinnedSpan GetData() { return Buffer.GetData(_renderer, _buffer, _bufferOffset, _bufferSize); } - public ReadOnlySpan GetData(int layer, int level) + public PinnedSpan GetData(int layer, int level) { return GetData(); } diff --git a/Ryujinx.Graphics.OpenGL/Image/TextureView.cs b/Ryujinx.Graphics.OpenGL/Image/TextureView.cs index 44df441f..ddc5f9a3 100644 --- a/Ryujinx.Graphics.OpenGL/Image/TextureView.cs +++ b/Ryujinx.Graphics.OpenGL/Image/TextureView.cs @@ -166,7 +166,7 @@ namespace Ryujinx.Graphics.OpenGL.Image _renderer.TextureCopy.Copy(this, (TextureView)destination, srcRegion, dstRegion, linearFilter); } - public unsafe ReadOnlySpan GetData() + public unsafe PinnedSpan GetData() { int size = 0; int levels = Info.GetLevelsClamped(); @@ -196,16 +196,16 @@ namespace Ryujinx.Graphics.OpenGL.Image data = FormatConverter.ConvertD24S8ToS8D24(data); } - return data; + return PinnedSpan.UnsafeFromSpan(data); } - public unsafe ReadOnlySpan GetData(int layer, int level) + public unsafe PinnedSpan GetData(int layer, int level) { int size = Info.GetMipSize(level); if (HwCapabilities.UsePersistentBufferForFlush) { - return _renderer.PersistentBuffers.Default.GetTextureData(this, size, layer, level); + return PinnedSpan.UnsafeFromSpan(_renderer.PersistentBuffers.Default.GetTextureData(this, size, layer, level)); } else { @@ -213,7 +213,7 @@ namespace Ryujinx.Graphics.OpenGL.Image int offset = WriteTo2D(target, layer, level); - return new ReadOnlySpan(target.ToPointer(), size).Slice(offset); + return new PinnedSpan((byte*)target.ToPointer() + offset, size); } } diff --git a/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs b/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs index c79700fc..91e52178 100644 --- a/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs +++ b/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs @@ -57,7 +57,7 @@ namespace Ryujinx.Graphics.OpenGL ResourcePool = new ResourcePool(); } - public BufferHandle CreateBuffer(int size) + public BufferHandle CreateBuffer(int size, BufferHandle storageHint) { BufferCount++; @@ -96,7 +96,7 @@ namespace Ryujinx.Graphics.OpenGL return new HardwareInfo(GpuVendor, GpuRenderer); } - public ReadOnlySpan GetBufferData(BufferHandle buffer, int offset, int size) + public PinnedSpan GetBufferData(BufferHandle buffer, int offset, int size) { return Buffer.GetData(this, buffer, offset, size); } -- cgit v1.2.3