diff options
Diffstat (limited to 'Ryujinx.HLE')
6 files changed, 97 insertions, 23 deletions
diff --git a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueCore.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueCore.cs index 1043dac9..b8fc71f3 100644 --- a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueCore.cs +++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueCore.cs @@ -46,6 +46,8 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger public const int BufferHistoryArraySize = 8; + public event Action BufferQueued; + public BufferQueueCore(Switch device, long pid) { Slots = new BufferSlotArray(); @@ -197,6 +199,11 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger WaitForLock(); } + public void SignalQueueEvent() + { + BufferQueued?.Invoke(); + } + private void WaitForLock() { if (Active) diff --git a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueProducer.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueProducer.cs index 03df04ad..d4227f01 100644 --- a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueProducer.cs +++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueProducer.cs @@ -486,6 +486,8 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger Monitor.PulseAll(_callbackLock); } + Core.SignalQueueEvent(); + return Status.Success; } diff --git a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs index bdffb499..1fef6860 100644 --- a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs +++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs @@ -25,8 +25,12 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger private Stopwatch _chrono; + private ManualResetEvent _event = new ManualResetEvent(false); + private AutoResetEvent _nextFrameEvent = new AutoResetEvent(true); private long _ticks; private long _ticksPerFrame; + private long _spinTicks; + private long _1msTicks; private int _swapInterval; @@ -61,8 +65,11 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger }; _chrono = new Stopwatch(); + _chrono.Start(); _ticks = 0; + _spinTicks = Stopwatch.Frequency / 500; + _1msTicks = Stopwatch.Frequency / 1000; UpdateSwapInterval(1); @@ -76,6 +83,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger // If the swap interval is 0, Game VSync is disabled. if (_swapInterval == 0) { + _nextFrameEvent.Set(); _ticksPerFrame = 1; } else @@ -129,6 +137,11 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger BufferQueueCore core = BufferQueue.CreateBufferQueue(_device, pid, out BufferQueueProducer producer, out BufferQueueConsumer consumer); + core.BufferQueued += () => + { + _nextFrameEvent.Set(); + }; + _layers.Add(layerId, new Layer { ProducerBinderId = HOSBinderDriverServer.RegisterBinderObject(producer), @@ -189,23 +202,59 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger { _isRunning = true; + long lastTicks = _chrono.ElapsedTicks; + while (_isRunning) { - _ticks += _chrono.ElapsedTicks; + long ticks = _chrono.ElapsedTicks; - _chrono.Restart(); - - if (_ticks >= _ticksPerFrame) + if (_swapInterval == 0) { Compose(); _device.System?.SignalVsync(); - _ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame); + _nextFrameEvent.WaitOne(17); + lastTicks = ticks; } + else + { + _ticks += ticks - lastTicks; + lastTicks = ticks; + + if (_ticks >= _ticksPerFrame) + { + Compose(); + + _device.System?.SignalVsync(); + + // Apply a maximum bound of 3 frames to the tick remainder, in case some event causes Ryujinx to pause for a long time or messes with the timer. + _ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame * 3); + } - // Sleep the minimal amount of time to avoid being too expensive. - Thread.Sleep(1); + // Sleep if possible. If the time til the next frame is too low, spin wait instead. + long diff = _ticksPerFrame - (_ticks + _chrono.ElapsedTicks - ticks); + if (diff > 0) + { + if (diff < _spinTicks) + { + do + { + // SpinWait is a little more HT/SMT friendly than aggressively updating/checking ticks. + // The value of 5 still gives us quite a bit of precision (~0.0003ms variance at worst) while waiting a reasonable amount of time. + Thread.SpinWait(5); + + ticks = _chrono.ElapsedTicks; + _ticks += ticks - lastTicks; + lastTicks = ticks; + } while (_ticks < _ticksPerFrame); + } + else + { + _event.WaitOne((int)(diff / _1msTicks)); + } + } + } } } @@ -299,6 +348,12 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger Item = item, }; + item.Fence.RegisterCallback(_device.Gpu, () => + { + _device.Gpu.Window.SignalFrameReady(); + _device.Gpu.GPFifo.Interrupt(); + }); + _device.Gpu.Window.EnqueueFrameThreadSafe( frameBufferAddress, frameBufferWidth, diff --git a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/AndroidFence.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/AndroidFence.cs index 7c5c9ba1..62c53f2d 100644 --- a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/AndroidFence.cs +++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/AndroidFence.cs @@ -66,6 +66,13 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger return false; } + public void RegisterCallback(GpuContext gpuContext, Action callback) + { + ref NvFence fence = ref NvFences[FenceCount - 1]; + + gpuContext.Synchronization.RegisterCallbackOnSyncpoint(fence.Id, fence.Value, callback); + } + public uint GetFlattenedSize() { return (uint)Unsafe.SizeOf<AndroidFence>(); diff --git a/Ryujinx.HLE/PerformanceStatistics.cs b/Ryujinx.HLE/PerformanceStatistics.cs index be86584a..fdc1e99f 100644 --- a/Ryujinx.HLE/PerformanceStatistics.cs +++ b/Ryujinx.HLE/PerformanceStatistics.cs @@ -16,12 +16,12 @@ namespace Ryujinx.HLE private double[] _previousFrameTime; private double[] _averagePercent; - private double[] _accumulatedPercent; + private double[] _accumulatedActiveTime; private double[] _percentLastEndTime; private double[] _percentStartTime; - private long[] _framesRendered; - private long[] _percentCount; + private long[] _framesRendered; + private double[] _percentTime; private object[] _frameLock; private object[] _percentLock; @@ -36,13 +36,13 @@ namespace Ryujinx.HLE _accumulatedFrameTime = new double[1]; _previousFrameTime = new double[1]; - _averagePercent = new double[1]; - _accumulatedPercent = new double[1]; - _percentLastEndTime = new double[1]; - _percentStartTime = new double[1]; + _averagePercent = new double[1]; + _accumulatedActiveTime = new double[1]; + _percentLastEndTime = new double[1]; + _percentStartTime = new double[1]; _framesRendered = new long[1]; - _percentCount = new long[1]; + _percentTime = new double[1]; _frameLock = new object[] { new object() }; _percentLock = new object[] { new object() }; @@ -91,16 +91,16 @@ namespace Ryujinx.HLE lock (_percentLock[percentType]) { - if (_percentCount[percentType] > 0) + if (_percentTime[percentType] > 0) { - percent = _accumulatedPercent[percentType] / _percentCount[percentType]; + percent = (_accumulatedActiveTime[percentType] / _percentTime[percentType]) * 100; } _averagePercent[percentType] = percent; - _percentCount[percentType] = 0; + _percentTime[percentType] = 0; - _accumulatedPercent[percentType] = 0; + _accumulatedActiveTime[percentType] = 0; } } @@ -138,13 +138,11 @@ namespace Ryujinx.HLE double elapsedTime = currentTime - _percentLastEndTime[percentType]; double elapsedActiveTime = currentTime - _percentStartTime[percentType]; - double percentActive = (elapsedActiveTime / elapsedTime) * 100; - lock (_percentLock[percentType]) { - _accumulatedPercent[percentType] += percentActive; + _accumulatedActiveTime[percentType] += elapsedActiveTime; - _percentCount[percentType]++; + _percentTime[percentType] += elapsedTime; } _percentLastEndTime[percentType] = currentTime; diff --git a/Ryujinx.HLE/Switch.cs b/Ryujinx.HLE/Switch.cs index 6014ccff..332727d3 100644 --- a/Ryujinx.HLE/Switch.cs +++ b/Ryujinx.HLE/Switch.cs @@ -177,6 +177,11 @@ namespace Ryujinx.HLE Gpu.GPFifo.DispatchCalls(); } + public bool ConsumeFrameAvailable() + { + return Gpu.Window.ConsumeFrameAvailable(); + } + public void PresentFrame(Action swapBuffersCallback) { Gpu.Window.Present(swapBuffersCallback); |