Cool_Tools/Ryujinx-uplift
1
0
Fork 0
mirror of https://github.com/GreemDev/Ryujinx.git synced 2024-11-28 11:50:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cache delegate for QueryModified, use regular multi handle. (#1771)

Browse Source
This commit is contained in:
riperiperi 2020-12-03 18:34:32 +00:00 committed by GitHub
parent 0ab1c42eea
commit 2c39a4f15d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Ryujinx.Graphics.Gpu/Image/Pool.cs
View File

@ -36,6 +36,7 @@ namespace Ryujinx.Graphics.Gpu.Image
public ulong Size { get; }
private readonly CpuMultiRegionHandle _memoryTracking;
private readonly Action<ulong, ulong> _modifiedDelegate;
public Pool(GpuContext context, ulong address, int maximumId)
{
@ -44,7 +45,7 @@ namespace Ryujinx.Graphics.Gpu.Image
int count = maximumId + 1;
ulong size = (ulong)(uint)count * DescriptorSize;;
ulong size = (ulong)(uint)count * DescriptorSize;
Items = new T[count];
@ -52,6 +53,7 @@ namespace Ryujinx.Graphics.Gpu.Image
Size = size;
_memoryTracking = context.PhysicalMemory.BeginGranularTracking(address, size);
_modifiedDelegate = RegionModified;
}
/// <summary>
@ -68,22 +70,29 @@ namespace Ryujinx.Graphics.Gpu.Image
/// </summary>
public void SynchronizeMemory()
{
_memoryTracking.QueryModified((ulong mAddress, ulong mSize) =>
_memoryTracking.QueryModified(_modifiedDelegate);
}
/// <summary>
/// Indicate that a region of the pool was modified, and must be loaded from memory.
/// </summary>
/// <param name="mAddress">Start address of the modified region</param>
/// <param name="mSize">Size of the modified region</param>
private void RegionModified(ulong mAddress, ulong mSize)
{
if (mAddress < Address)
{
if (mAddress < Address)
{
mAddress = Address;
}
mAddress = Address;
}
ulong maxSize = Address + Size - mAddress;
ulong maxSize = Address + Size - mAddress;
if (mSize > maxSize)
{
mSize = maxSize;
}
if (mSize > maxSize)
{
mSize = maxSize;
}
InvalidateRangeImpl(mAddress, mSize);
});
InvalidateRangeImpl(mAddress, mSize);
}
protected abstract void InvalidateRangeImpl(ulong address, ulong size);

50
Ryujinx.Graphics.Gpu/Memory/Buffer.cs
View File

@ -34,8 +34,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
/// </summary>
public ulong EndAddress => Address + Size;
private CpuSmartMultiRegionHandle _memoryTrackingGranular;
private CpuMultiRegionHandle _memoryTrackingGranular;
private CpuRegionHandle _memoryTracking;
private readonly Action<ulong, ulong> _modifiedDelegate;
private int _sequenceNumber;
private bool _useGranular;
@ -58,12 +59,14 @@ namespace Ryujinx.Graphics.Gpu.Memory
if (_useGranular)
{
_memoryTrackingGranular = context.PhysicalMemory.BeginSmartGranularTracking(address, size);
_memoryTrackingGranular = context.PhysicalMemory.BeginGranularTracking(address, size);
}
else
{
_memoryTracking = context.PhysicalMemory.BeginTracking(address, size);
}
_modifiedDelegate = new Action<ulong, ulong>(RegionModified);
}
/// <summary>
@ -106,24 +109,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
{
if (_useGranular)
{
_memoryTrackingGranular.QueryModified(address, size, (ulong mAddress, ulong mSize) =>
{
if (mAddress < Address)
{
mAddress = Address;
}
ulong maxSize = Address + Size - mAddress;
if (mSize > maxSize)
{
mSize = maxSize;
}
int offset = (int)(mAddress - Address);
_context.Renderer.SetBufferData(Handle, offset, _context.PhysicalMemory.GetSpan(mAddress, (int)mSize));
}, _context.SequenceNumber);
_memoryTrackingGranular.QueryModified(address, size, _modifiedDelegate, _context.SequenceNumber);
}
else
{
@ -136,6 +122,30 @@ namespace Ryujinx.Graphics.Gpu.Memory
}
}
/// <summary>
/// Indicate that a region of the buffer was modified, and must be loaded from memory.
/// </summary>
/// <param name="mAddress">Start address of the modified region</param>
/// <param name="mSize">Size of the modified region</param>
private void RegionModified(ulong mAddress, ulong mSize)
{
if (mAddress < Address)
{
mAddress = Address;
}
ulong maxSize = Address + Size - mAddress;
if (mSize > maxSize)
{
mSize = maxSize;
}
int offset = (int)(mAddress - Address);
_context.Renderer.SetBufferData(Handle, offset, _context.PhysicalMemory.GetSpan(mAddress, (int)mSize));
}
/// <summary>
/// Performs copy of all the buffer data from one buffer to another.
/// </summary>