vleeuwenmenno/Ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Surface Flinger: Implement GetBufferHistory (#1232)

Browse Source 
* Surface Flinger: Implement GetBufferHistory

Also fix some bugs on the Surface Flinger implementation

* Address Ac_K's comment
This commit is contained in:
Thog
2020-05-15 03:30:08 +02:00
committed by GitHub
parent b2e5855928
commit 378259a40a
12 changed files with 167 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Ryujinx.HLE/HOS/Services/SurfaceFlinger/BufferQueueCore.cs
View File

@ -1,6 +1,7 @@
using Ryujinx.Common.Logging;
using Ryujinx.HLE.HOS.Kernel.Process;
using Ryujinx.HLE.HOS.Kernel.Threading;
using Ryujinx.HLE.HOS.Services.SurfaceFlinger.Types;
using System;
using System.Collections.Generic;
using System.Threading;
@ -29,6 +30,9 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
public bool ConsumerControlledByApp;
public uint ConsumerUsageBits;
public List<BufferItem> Queue;
public BufferInfo[] BufferHistory;
public uint BufferHistoryPosition;
public bool EnableExternalEvent;
public readonly object Lock = new object();
@ -37,6 +41,8 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
public KProcess Owner { get; }
public const int BufferHistoryArraySize = 8;
public BufferQueueCore(Switch device, KProcess process)
{
Slots = new BufferSlotArray();
@ -64,6 +70,9 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
_frameAvailableEvent = new KEvent(device.System.KernelContext);
Owner = process;
BufferHistory = new BufferInfo[BufferHistoryArraySize];
EnableExternalEvent = true;
}
public int GetMinUndequeuedBufferCountLocked(bool async)
@ -129,12 +138,18 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
public void SignalWaitBufferFreeEvent()
{
_waitBufferFreeEvent.WritableEvent.Signal();
if (EnableExternalEvent)
{
_waitBufferFreeEvent.WritableEvent.Signal();
}
}
public void SignalFrameAvailableEvent()
{
_frameAvailableEvent.WritableEvent.Signal();
if (EnableExternalEvent)
{
_frameAvailableEvent.WritableEvent.Signal();
}
}
// TODO: Find an accurate way to handle a regular condvar here as this will wake up unwanted threads in some edge cases.
@ -201,6 +216,11 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
public void CheckSystemEventsLocked(int maxBufferCount)
{
if (!EnableExternalEvent)
{
return;
}
bool needBufferReleaseSignal = false;
bool needFrameAvailableSignal = false;