SurfaceFlinger v2 (#981)
* 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
This commit is contained in:
parent
03711dd7b5
commit
36749c358d
50 changed files with 3416 additions and 831 deletions
109
Ryujinx.HLE/HOS/Services/SurfaceFlinger/HOSBinderDriverServer.cs
Normal file
109
Ryujinx.HLE/HOS/Services/SurfaceFlinger/HOSBinderDriverServer.cs
Normal file
|
@ -0,0 +1,109 @@
|
|||
using Ryujinx.Common.Logging;
|
||||
using Ryujinx.HLE.HOS.Kernel.Threading;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
||||
{
|
||||
class HOSBinderDriverServer : IHOSBinderDriver
|
||||
{
|
||||
private static Dictionary<int, IBinder> _registeredBinderObjects = new Dictionary<int, IBinder>();
|
||||
|
||||
private static int _lastBinderId = 0;
|
||||
|
||||
private static object _lock = new object();
|
||||
|
||||
public static int RegisterBinderObject(IBinder binder)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
_lastBinderId++;
|
||||
|
||||
_registeredBinderObjects.Add(_lastBinderId, binder);
|
||||
|
||||
return _lastBinderId;
|
||||
}
|
||||
}
|
||||
|
||||
public static void UnregisterBinderObject(int binderId)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
_registeredBinderObjects.Remove(binderId);
|
||||
}
|
||||
}
|
||||
|
||||
public static int GetBinderId(IBinder binder)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
foreach (KeyValuePair<int, IBinder> pair in _registeredBinderObjects)
|
||||
{
|
||||
if (ReferenceEquals(binder, pair.Value))
|
||||
{
|
||||
return pair.Key;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
private static IBinder GetBinderObjectById(int binderId)
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
if (_registeredBinderObjects.TryGetValue(binderId, out IBinder binder))
|
||||
{
|
||||
return binder;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
protected override ResultCode AdjustRefcount(int binderId, int addVal, int type)
|
||||
{
|
||||
IBinder binder = GetBinderObjectById(binderId);
|
||||
|
||||
if (binder == null)
|
||||
{
|
||||
Logger.PrintError(LogClass.SurfaceFlinger, $"Invalid binder id {binderId}");
|
||||
|
||||
return ResultCode.Success;
|
||||
}
|
||||
|
||||
return binder.AdjustRefcount(addVal, type);
|
||||
}
|
||||
|
||||
protected override void GetNativeHandle(int binderId, uint typeId, out KReadableEvent readableEvent)
|
||||
{
|
||||
IBinder binder = GetBinderObjectById(binderId);
|
||||
|
||||
if (binder == null)
|
||||
{
|
||||
readableEvent = null;
|
||||
|
||||
Logger.PrintError(LogClass.SurfaceFlinger, $"Invalid binder id {binderId}");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
binder.GetNativeHandle(typeId, out readableEvent);
|
||||
}
|
||||
|
||||
protected override ResultCode OnTransact(int binderId, uint code, uint flags, ReadOnlySpan<byte> inputParcel, Span<byte> outputParcel)
|
||||
{
|
||||
IBinder binder = GetBinderObjectById(binderId);
|
||||
|
||||
if (binder == null)
|
||||
{
|
||||
Logger.PrintError(LogClass.SurfaceFlinger, $"Invalid binder id {binderId}");
|
||||
|
||||
return ResultCode.Success;
|
||||
}
|
||||
|
||||
return binder.OnTransact(code, flags, inputParcel, outputParcel);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue