mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-23 06:42:44 +00:00
a1f77a5b6a
* Initial implementation of buffer flush (VERY WIP) * Host shaders need to be rebuilt for the SSBO write flag. * New approach with reserved regions and gl sync * Fix a ton of buffer issues. * Remove unused buffer unmapped behaviour * Revert "Remove unused buffer unmapped behaviour" This reverts commit f1700e52fb8760180ac5e0987a07d409d1e70ece. * Delete modified ranges on unmap Fixes potential crashes in Super Smash Bros, where a previously modified range could lie on either side of an unmap. * Cache some more delegates. * Dispose Sync on Close * Also create host sync for GPFifo syncpoint increment. * Copy buffer optimization, add docs * Fix race condition with OpenGL Sync * Enable read tracking on CommandBuffer, insert syncpoint on WaitForIdle * Performance: Only flush individual pages of SSBO at a time This avoids flushing large amounts of data when only a small amount is actually used. * Signal Modified rather than flushing after clear * Fix some docs and code style. * Introduce a new test for tracking memory protection. Sucessfully demonstrates that the bug causing write protection to be cleared by a read action has been fixed. (these tests fail on master) * Address Comments * Add host sync for SetReference This ensures that any indirect draws will correctly flush any related buffer data written before them. Fixes some flashing and misplaced world geometry in MH rise. * Make PageAlign static * Re-enable read tracking, for reads.
146 lines
4.4 KiB
C#
146 lines
4.4 KiB
C#
using System;
|
|
|
|
namespace Ryujinx.Memory.Tracking
|
|
{
|
|
/// <summary>
|
|
/// A region handle that tracks a large region using many smaller handles, to provide
|
|
/// granular tracking that can be used to track partial updates.
|
|
/// </summary>
|
|
public class MultiRegionHandle : IMultiRegionHandle
|
|
{
|
|
/// <summary>
|
|
/// A list of region handles for each granularity sized chunk of the whole region.
|
|
/// </summary>
|
|
private readonly RegionHandle[] _handles;
|
|
private readonly ulong Address;
|
|
private readonly ulong Granularity;
|
|
private readonly ulong Size;
|
|
|
|
public bool Dirty { get; private set; } = true;
|
|
|
|
internal MultiRegionHandle(MemoryTracking tracking, ulong address, ulong size, ulong granularity)
|
|
{
|
|
_handles = new RegionHandle[size / granularity];
|
|
Granularity = granularity;
|
|
|
|
for (int i = 0; i < _handles.Length; i++)
|
|
{
|
|
RegionHandle handle = tracking.BeginTracking(address + (ulong)i * granularity, granularity);
|
|
handle.Parent = this;
|
|
_handles[i] = handle;
|
|
}
|
|
|
|
Address = address;
|
|
Size = size;
|
|
}
|
|
|
|
public void SignalWrite()
|
|
{
|
|
Dirty = true;
|
|
}
|
|
|
|
public void QueryModified(Action<ulong, ulong> modifiedAction)
|
|
{
|
|
if (!Dirty)
|
|
{
|
|
return;
|
|
}
|
|
|
|
Dirty = false;
|
|
|
|
QueryModified(Address, Size, modifiedAction);
|
|
}
|
|
|
|
public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction)
|
|
{
|
|
int startHandle = (int)((address - Address) / Granularity);
|
|
int lastHandle = (int)((address + (size - 1) - Address) / Granularity);
|
|
|
|
ulong rgStart = _handles[startHandle].Address;
|
|
ulong rgSize = 0;
|
|
|
|
for (int i = startHandle; i <= lastHandle; i++)
|
|
{
|
|
RegionHandle handle = _handles[i];
|
|
|
|
if (handle.Dirty)
|
|
{
|
|
rgSize += handle.Size;
|
|
handle.Reprotect();
|
|
}
|
|
else
|
|
{
|
|
// Submit the region scanned so far as dirty
|
|
if (rgSize != 0)
|
|
{
|
|
modifiedAction(rgStart, rgSize);
|
|
rgSize = 0;
|
|
}
|
|
rgStart = handle.EndAddress;
|
|
}
|
|
}
|
|
|
|
if (rgSize != 0)
|
|
{
|
|
modifiedAction(rgStart, rgSize);
|
|
}
|
|
}
|
|
|
|
public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction, int sequenceNumber)
|
|
{
|
|
int startHandle = (int)((address - Address) / Granularity);
|
|
int lastHandle = (int)((address + (size - 1) - Address) / Granularity);
|
|
|
|
ulong rgStart = _handles[startHandle].Address;
|
|
ulong rgSize = 0;
|
|
|
|
for (int i = startHandle; i <= lastHandle; i++)
|
|
{
|
|
RegionHandle handle = _handles[i];
|
|
|
|
if (handle.Dirty && sequenceNumber != handle.SequenceNumber)
|
|
{
|
|
rgSize += handle.Size;
|
|
handle.Reprotect();
|
|
}
|
|
else
|
|
{
|
|
// Submit the region scanned so far as dirty
|
|
if (rgSize != 0)
|
|
{
|
|
modifiedAction(rgStart, rgSize);
|
|
rgSize = 0;
|
|
}
|
|
rgStart = handle.EndAddress;
|
|
}
|
|
|
|
handle.SequenceNumber = sequenceNumber;
|
|
}
|
|
|
|
if (rgSize != 0)
|
|
{
|
|
modifiedAction(rgStart, rgSize);
|
|
}
|
|
}
|
|
|
|
public void RegisterAction(ulong address, ulong size, RegionSignal action)
|
|
{
|
|
int startHandle = (int)((address - Address) / Granularity);
|
|
int lastHandle = (int)((address + (size - 1) - Address) / Granularity);
|
|
|
|
for (int i = startHandle; i <= lastHandle; i++)
|
|
{
|
|
_handles[i].RegisterAction(action);
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
foreach (var handle in _handles)
|
|
{
|
|
handle.Dispose();
|
|
}
|
|
}
|
|
}
|
|
}
|