mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-10-20 21:21:40 +00:00
36749c358d
* Rewrite SurfaceFlinger Reimplement accurately SurfaceFlinger (based on my 8.1.0 reversing of it) TODO: support swap interval properly and reintroduce disabled "game vsync" support. * Some fixes for SetBufferCount * uncomment a test from last commit * SurfaceFlinger: don't free the graphic buffer in SetBufferCount * SurfaceFlinger: Implement swap interval correctly * SurfaceFlinger: Reintegrate Game VSync toggle * SurfaceFlinger: do not push a fence on buffer release on the consumer side * Revert "SurfaceFlinger: do not push a fence on buffer release on the consumer side" This reverts commit 586b52b0bfab2d11f361f4b59ab7b7141020bbad. * Make the game vsync toggle work dynamically again * Unregister producer's Binder object when closing layer * Address ripinperi's comments * Add a timeout on syncpoint wait operation Syncpoint aren't supposed to be waited on for more than a second. This effectively workaround issues caused by not having a channel scheduling in place yet. PS: Also introduce Android WaitForever warning about fence being not signaled for 3s * Fix a print of previous commit * Address Ac_K's comments * Address gdkchan's comments * Address final comments
195 lines
No EOL
5.3 KiB
C#
195 lines
No EOL
5.3 KiB
C#
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Graphics.Gpu.Synchronization;
|
|
using Ryujinx.HLE.HOS.Kernel.Threading;
|
|
using System;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl
|
|
{
|
|
class NvHostSyncpt
|
|
{
|
|
public const int VBlank0SyncpointId = 26;
|
|
public const int VBlank1SyncpointId = 27;
|
|
|
|
private int[] _counterMin;
|
|
private int[] _counterMax;
|
|
private bool[] _clientManaged;
|
|
private bool[] _assigned;
|
|
|
|
private Switch _device;
|
|
|
|
private object _syncpointAllocatorLock = new object();
|
|
|
|
public NvHostSyncpt(Switch device)
|
|
{
|
|
_device = device;
|
|
_counterMin = new int[SynchronizationManager.MaxHardwareSyncpoints];
|
|
_counterMax = new int[SynchronizationManager.MaxHardwareSyncpoints];
|
|
_clientManaged = new bool[SynchronizationManager.MaxHardwareSyncpoints];
|
|
_assigned = new bool[SynchronizationManager.MaxHardwareSyncpoints];
|
|
|
|
// Reserve VBLANK syncpoints
|
|
ReserveSyncpointLocked(VBlank0SyncpointId, true);
|
|
ReserveSyncpointLocked(VBlank1SyncpointId, true);
|
|
}
|
|
|
|
private void ReserveSyncpointLocked(uint id, bool isClientManaged)
|
|
{
|
|
if (id >= SynchronizationManager.MaxHardwareSyncpoints || _assigned[id])
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(id));
|
|
}
|
|
|
|
_assigned[id] = true;
|
|
_clientManaged[id] = isClientManaged;
|
|
}
|
|
|
|
public uint AllocateSyncpoint(bool isClientManaged)
|
|
{
|
|
lock (_syncpointAllocatorLock)
|
|
{
|
|
for (uint i = 1; i < SynchronizationManager.MaxHardwareSyncpoints; i++)
|
|
{
|
|
if (!_assigned[i])
|
|
{
|
|
ReserveSyncpointLocked(i, isClientManaged);
|
|
return i;
|
|
}
|
|
}
|
|
}
|
|
|
|
Logger.PrintError(LogClass.ServiceNv, "Cannot allocate a new syncpoint!");
|
|
|
|
return 0;
|
|
}
|
|
|
|
public void ReleaseSyncpoint(uint id)
|
|
{
|
|
if (id == 0)
|
|
{
|
|
return;
|
|
}
|
|
|
|
lock (_syncpointAllocatorLock)
|
|
{
|
|
if (id >= SynchronizationManager.MaxHardwareSyncpoints || !_assigned[id])
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(id));
|
|
}
|
|
|
|
_assigned[id] = false;
|
|
_clientManaged[id] = false;
|
|
|
|
SetSyncpointMinEqualSyncpointMax(id);
|
|
}
|
|
}
|
|
|
|
public void SetSyncpointMinEqualSyncpointMax(uint id)
|
|
{
|
|
if (id >= SynchronizationManager.MaxHardwareSyncpoints)
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(id));
|
|
}
|
|
|
|
int value = (int)ReadSyncpointValue(id);
|
|
|
|
Interlocked.Exchange(ref _counterMax[id], value);
|
|
}
|
|
|
|
public uint ReadSyncpointValue(uint id)
|
|
{
|
|
return UpdateMin(id);
|
|
}
|
|
|
|
public uint ReadSyncpointMinValue(uint id)
|
|
{
|
|
return (uint)_counterMin[id];
|
|
}
|
|
|
|
public uint ReadSyncpointMaxValue(uint id)
|
|
{
|
|
return (uint)_counterMax[id];
|
|
}
|
|
|
|
private bool IsClientManaged(uint id)
|
|
{
|
|
if (id >= SynchronizationManager.MaxHardwareSyncpoints)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return _clientManaged[id];
|
|
}
|
|
|
|
public void Increment(uint id)
|
|
{
|
|
if (IsClientManaged(id))
|
|
{
|
|
IncrementSyncpointMax(id);
|
|
}
|
|
|
|
IncrementSyncpointGPU(id);
|
|
}
|
|
|
|
public uint UpdateMin(uint id)
|
|
{
|
|
uint newValue = _device.Gpu.Synchronization.GetSyncpointValue(id);
|
|
|
|
Interlocked.Exchange(ref _counterMin[id], (int)newValue);
|
|
|
|
return newValue;
|
|
}
|
|
|
|
private void IncrementSyncpointGPU(uint id)
|
|
{
|
|
_device.Gpu.Synchronization.IncrementSyncpoint(id);
|
|
}
|
|
|
|
public void IncrementSyncpointMin(uint id)
|
|
{
|
|
Interlocked.Increment(ref _counterMin[id]);
|
|
}
|
|
|
|
public uint IncrementSyncpointMaxExt(uint id, int count)
|
|
{
|
|
if (count == 0)
|
|
{
|
|
return ReadSyncpointMaxValue(id);
|
|
}
|
|
|
|
uint result = 0;
|
|
|
|
for (int i = 0; i < count; i++)
|
|
{
|
|
result = IncrementSyncpointMax(id);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
private uint IncrementSyncpointMax(uint id)
|
|
{
|
|
return (uint)Interlocked.Increment(ref _counterMax[id]);
|
|
}
|
|
|
|
public bool IsSyncpointExpired(uint id, uint threshold)
|
|
{
|
|
return MinCompare(id, _counterMin[id], _counterMax[id], (int)threshold);
|
|
}
|
|
|
|
private bool MinCompare(uint id, int min, int max, int threshold)
|
|
{
|
|
int minDiff = min - threshold;
|
|
int maxDiff = max - threshold;
|
|
|
|
if (IsClientManaged(id))
|
|
{
|
|
return minDiff >= 0;
|
|
}
|
|
else
|
|
{
|
|
return (uint)maxDiff >= (uint)minDiff;
|
|
}
|
|
}
|
|
}
|
|
} |