mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-23 11:01:20 -08:00
801b71a128
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0059 warnings * Address dotnet format CA1816 warnings * Fix new dotnet-format issues after rebase * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Another rebase, another dotnet format run * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Remove redundant code * Rename generics * Address review feedback * Remove SetOrigin
216 lines
6.0 KiB
C#
216 lines
6.0 KiB
C#
using Ryujinx.Common.Logging;
|
|
using Silk.NET.Vulkan;
|
|
using System.Collections.Generic;
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
|
|
namespace Ryujinx.Graphics.Vulkan
|
|
{
|
|
class SyncManager
|
|
{
|
|
private class SyncHandle
|
|
{
|
|
public ulong ID;
|
|
public MultiFenceHolder Waitable;
|
|
public ulong FlushId;
|
|
public bool Signalled;
|
|
|
|
public bool NeedsFlush(ulong currentFlushId)
|
|
{
|
|
return (long)(FlushId - currentFlushId) >= 0;
|
|
}
|
|
}
|
|
|
|
private ulong _firstHandle;
|
|
|
|
private readonly VulkanRenderer _gd;
|
|
private readonly Device _device;
|
|
private readonly List<SyncHandle> _handles;
|
|
private ulong _flushId;
|
|
private long _waitTicks;
|
|
|
|
public SyncManager(VulkanRenderer gd, Device device)
|
|
{
|
|
_gd = gd;
|
|
_device = device;
|
|
_handles = new List<SyncHandle>();
|
|
}
|
|
|
|
public void RegisterFlush()
|
|
{
|
|
_flushId++;
|
|
}
|
|
|
|
public void Create(ulong id, bool strict)
|
|
{
|
|
ulong flushId = _flushId;
|
|
MultiFenceHolder waitable = new();
|
|
if (strict || _gd.InterruptAction == null)
|
|
{
|
|
_gd.FlushAllCommands();
|
|
_gd.CommandBufferPool.AddWaitable(waitable);
|
|
}
|
|
else
|
|
{
|
|
// Don't flush commands, instead wait for the current command buffer to finish.
|
|
// If this sync is waited on before the command buffer is submitted, interrupt the gpu thread and flush it manually.
|
|
|
|
_gd.CommandBufferPool.AddInUseWaitable(waitable);
|
|
}
|
|
|
|
SyncHandle handle = new()
|
|
{
|
|
ID = id,
|
|
Waitable = waitable,
|
|
FlushId = flushId,
|
|
};
|
|
|
|
lock (_handles)
|
|
{
|
|
_handles.Add(handle);
|
|
}
|
|
}
|
|
|
|
public ulong GetCurrent()
|
|
{
|
|
lock (_handles)
|
|
{
|
|
ulong lastHandle = _firstHandle;
|
|
|
|
foreach (SyncHandle handle in _handles)
|
|
{
|
|
lock (handle)
|
|
{
|
|
if (handle.Waitable == null)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (handle.ID > lastHandle)
|
|
{
|
|
bool signaled = handle.Signalled || handle.Waitable.WaitForFences(_gd.Api, _device, 0);
|
|
if (signaled)
|
|
{
|
|
lastHandle = handle.ID;
|
|
handle.Signalled = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return lastHandle;
|
|
}
|
|
}
|
|
|
|
public void Wait(ulong id)
|
|
{
|
|
SyncHandle result = null;
|
|
|
|
lock (_handles)
|
|
{
|
|
if ((long)(_firstHandle - id) > 0)
|
|
{
|
|
return; // The handle has already been signalled or deleted.
|
|
}
|
|
|
|
foreach (SyncHandle handle in _handles)
|
|
{
|
|
if (handle.ID == id)
|
|
{
|
|
result = handle;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (result != null)
|
|
{
|
|
if (result.Waitable == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
long beforeTicks = Stopwatch.GetTimestamp();
|
|
|
|
if (result.NeedsFlush(_flushId))
|
|
{
|
|
_gd.InterruptAction(() =>
|
|
{
|
|
if (result.NeedsFlush(_flushId))
|
|
{
|
|
_gd.FlushAllCommands();
|
|
}
|
|
});
|
|
}
|
|
|
|
lock (result)
|
|
{
|
|
if (result.Waitable == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
bool signaled = result.Signalled || result.Waitable.WaitForFences(_gd.Api, _device, 1000000000);
|
|
|
|
if (!signaled)
|
|
{
|
|
Logger.Error?.PrintMsg(LogClass.Gpu, $"VK Sync Object {result.ID} failed to signal within 1000ms. Continuing...");
|
|
}
|
|
else
|
|
{
|
|
_waitTicks += Stopwatch.GetTimestamp() - beforeTicks;
|
|
result.Signalled = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public void Cleanup()
|
|
{
|
|
// Iterate through handles and remove any that have already been signalled.
|
|
|
|
while (true)
|
|
{
|
|
SyncHandle first = null;
|
|
lock (_handles)
|
|
{
|
|
first = _handles.FirstOrDefault();
|
|
}
|
|
|
|
if (first == null || first.NeedsFlush(_flushId))
|
|
{
|
|
break;
|
|
}
|
|
|
|
bool signaled = first.Waitable.WaitForFences(_gd.Api, _device, 0);
|
|
if (signaled)
|
|
{
|
|
// Delete the sync object.
|
|
lock (_handles)
|
|
{
|
|
lock (first)
|
|
{
|
|
_firstHandle = first.ID + 1;
|
|
_handles.RemoveAt(0);
|
|
first.Waitable = null;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// This sync handle and any following have not been reached yet.
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
public long GetAndResetWaitTicks()
|
|
{
|
|
long result = _waitTicks;
|
|
_waitTicks = 0;
|
|
|
|
return result;
|
|
}
|
|
}
|
|
}
|