mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-11-08 11:28:33 +00:00
9f1cf6458c
* 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
161 lines
4.5 KiB
C#
161 lines
4.5 KiB
C#
using Ryujinx.Common.Memory;
|
|
using Ryujinx.Graphics.GAL;
|
|
using Silk.NET.Vulkan;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using VkFormat = Silk.NET.Vulkan.Format;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
class TextureBuffer : ITexture
|
|
{
|
|
private readonly VulkanRenderer _gd;
|
|
|
|
private BufferHandle _bufferHandle;
|
|
private int _offset;
|
|
private int _size;
|
|
private Auto<DisposableBufferView> _bufferView;
|
|
private Dictionary<GAL.Format, Auto<DisposableBufferView>> _selfManagedViews;
|
|
|
|
private int _bufferCount;
|
|
|
|
public int Width { get; }
|
|
public int Height { get; }
|
|
|
|
public VkFormat VkFormat { get; }
|
|
|
|
public float ScaleFactor { get; }
|
|
|
|
public TextureBuffer(VulkanRenderer gd, TextureCreateInfo info, float scale)
|
|
{
|
|
_gd = gd;
|
|
Width = info.Width;
|
|
Height = info.Height;
|
|
VkFormat = FormatTable.GetFormat(info.Format);
|
|
ScaleFactor = scale;
|
|
|
|
gd.Textures.Add(this);
|
|
}
|
|
|
|
public void CopyTo(ITexture destination, int firstLayer, int firstLevel)
|
|
{
|
|
throw new NotSupportedException();
|
|
}
|
|
|
|
public void CopyTo(ITexture destination, int srcLayer, int dstLayer, int srcLevel, int dstLevel)
|
|
{
|
|
throw new NotSupportedException();
|
|
}
|
|
|
|
public void CopyTo(ITexture destination, Extents2D srcRegion, Extents2D dstRegion, bool linearFilter)
|
|
{
|
|
throw new NotSupportedException();
|
|
}
|
|
|
|
public ITexture CreateView(TextureCreateInfo info, int firstLayer, int firstLevel)
|
|
{
|
|
throw new NotSupportedException();
|
|
}
|
|
|
|
public PinnedSpan<byte> GetData()
|
|
{
|
|
return _gd.GetBufferData(_bufferHandle, _offset, _size);
|
|
}
|
|
|
|
public PinnedSpan<byte> GetData(int layer, int level)
|
|
{
|
|
return GetData();
|
|
}
|
|
|
|
public void Release()
|
|
{
|
|
if (_gd.Textures.Remove(this))
|
|
{
|
|
ReleaseImpl();
|
|
}
|
|
}
|
|
|
|
private void ReleaseImpl()
|
|
{
|
|
if (_selfManagedViews != null)
|
|
{
|
|
foreach (var bufferView in _selfManagedViews.Values)
|
|
{
|
|
bufferView.Dispose();
|
|
}
|
|
|
|
_selfManagedViews = null;
|
|
}
|
|
|
|
_bufferView?.Dispose();
|
|
_bufferView = null;
|
|
}
|
|
|
|
public void SetData(SpanOrArray<byte> data)
|
|
{
|
|
_gd.SetBufferData(_bufferHandle, _offset, data);
|
|
}
|
|
|
|
public void SetData(SpanOrArray<byte> data, int layer, int level)
|
|
{
|
|
throw new NotSupportedException();
|
|
}
|
|
|
|
public void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region)
|
|
{
|
|
throw new NotSupportedException();
|
|
}
|
|
|
|
public void SetStorage(BufferRange buffer)
|
|
{
|
|
if (_bufferHandle == buffer.Handle &&
|
|
_offset == buffer.Offset &&
|
|
_size == buffer.Size &&
|
|
_bufferCount == _gd.BufferManager.BufferCount)
|
|
{
|
|
return;
|
|
}
|
|
|
|
_bufferHandle = buffer.Handle;
|
|
_offset = buffer.Offset;
|
|
_size = buffer.Size;
|
|
_bufferCount = _gd.BufferManager.BufferCount;
|
|
|
|
ReleaseImpl();
|
|
}
|
|
|
|
public BufferView GetBufferView(CommandBufferScoped cbs)
|
|
{
|
|
if (_bufferView == null)
|
|
{
|
|
_bufferView = _gd.BufferManager.CreateView(_bufferHandle, VkFormat, _offset, _size, ReleaseImpl);
|
|
}
|
|
|
|
return _bufferView?.Get(cbs, _offset, _size).Value ?? default;
|
|
}
|
|
|
|
public BufferView GetBufferView(CommandBufferScoped cbs, GAL.Format format)
|
|
{
|
|
var vkFormat = FormatTable.GetFormat(format);
|
|
if (vkFormat == VkFormat)
|
|
{
|
|
return GetBufferView(cbs);
|
|
}
|
|
|
|
if (_selfManagedViews != null && _selfManagedViews.TryGetValue(format, out var bufferView))
|
|
{
|
|
return bufferView.Get(cbs, _offset, _size).Value;
|
|
}
|
|
|
|
bufferView = _gd.BufferManager.CreateView(_bufferHandle, vkFormat, _offset, _size, ReleaseImpl);
|
|
|
|
if (bufferView != null)
|
|
{
|
|
(_selfManagedViews ??= new Dictionary<GAL.Format, Auto<DisposableBufferView>>()).Add(format, bufferView);
|
|
}
|
|
|
|
return bufferView?.Get(cbs, _offset, _size).Value ?? default;
|
|
}
|
|
}
|
|
}
|