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

3 files changed, 44 insertions, 154 deletions

diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs
deleted file mode 100644
index e30d159c..00000000
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using Ryujinx.Graphics.GAL;
-using Ryujinx.HLE.HOS.Ipc;
-using Ryujinx.HLE.HOS.Kernel.Common;
-using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
-using System;
-
-namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
-{
-    class IHOSBinderDriver : IpcService, IDisposable
-    {
-        private KEvent _binderEvent;
-
-        private NvFlinger _flinger;
-
-        public IHOSBinderDriver(Horizon system, IRenderer renderer)
-        {
-            _binderEvent = new KEvent(system);
-
-            _binderEvent.ReadableEvent.Signal();
-
-            _flinger = new NvFlinger(renderer, _binderEvent);
-        }
-
-        [Command(0)]
-        // TransactParcel(s32, u32, u32, buffer<unknown, 5, 0>) -> buffer<unknown, 6, 0>
-        public ResultCode TransactParcel(ServiceCtx context)
-        {
-            int id   = context.RequestData.ReadInt32();
-            int code = context.RequestData.ReadInt32();
-
-            long dataPos  = context.Request.SendBuff[0].Position;
-            long dataSize = context.Request.SendBuff[0].Size;
-
-            byte[] data = context.Memory.ReadBytes(dataPos, dataSize);
-
-            data = Parcel.GetParcelData(data);
-
-            return (ResultCode)_flinger.ProcessParcelRequest(context, data, code);
-        }
-
-        [Command(1)]
-        // AdjustRefcount(s32, s32, s32)
-        public ResultCode AdjustRefcount(ServiceCtx context)
-        {
-            int id     = context.RequestData.ReadInt32();
-            int addVal = context.RequestData.ReadInt32();
-            int type   = context.RequestData.ReadInt32();
-
-            return ResultCode.Success;
-        }
-
-        [Command(2)]
-        // GetNativeHandle(s32, s32) -> handle<copy>
-        public ResultCode GetNativeHandle(ServiceCtx context)
-        {
-            int  id  = context.RequestData.ReadInt32();
-            uint unk = context.RequestData.ReadUInt32();
-
-            if (context.Process.HandleTable.GenerateHandle(_binderEvent.ReadableEvent, out int handle) != KernelResult.Success)
-            {
-                throw new InvalidOperationException("Out of handles!");
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeMove(handle);
-
-            return ResultCode.Success;
-        }
-
-        [Command(3)] // 3.0.0+
-        // TransactParcelAuto(s32, u32, u32, buffer<unknown, 21, 0>) -> buffer<unknown, 22, 0>
-        public ResultCode TransactParcelAuto(ServiceCtx context)
-        {
-            int id = context.RequestData.ReadInt32();
-            int code = context.RequestData.ReadInt32();
-
-            (long dataPos, long dataSize) = context.Request.GetBufferType0x21();
-
-            byte[] data = context.Memory.ReadBytes(dataPos, dataSize);
-
-            data = Parcel.GetParcelData(data);
-
-            return (ResultCode)_flinger.ProcessParcelRequest(context, data, code);
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _flinger.Dispose();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs
index 24e73244..f8ef494a 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs
@@ -1,4 +1,5 @@
 using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
 
 namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
 {
@@ -15,9 +16,12 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
         // CreateManagedLayer(u32, u64, nn::applet::AppletResourceUserId) -> u64
         public ResultCode CreateManagedLayer(ServiceCtx context)
         {
-            Logger.PrintStub(LogClass.ServiceVi);
+            long layerFlags = context.RequestData.ReadInt64();
+            long displayId  = context.RequestData.ReadInt64();
+
+            context.Device.System.SurfaceFlinger.CreateLayer(context.Process, out long layerId);
 
-            context.ResponseData.Write(0L); //LayerId
+            context.ResponseData.Write(layerId);
 
             return ResultCode.Success;
         }
@@ -26,7 +30,9 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
         // DestroyManagedLayer(u64)
         public ResultCode DestroyManagedLayer(ServiceCtx context)
         {
-            Logger.PrintStub(LogClass.ServiceVi);
+            long layerId = context.RequestData.ReadInt64();
+
+            context.Device.System.SurfaceFlinger.CloseLayer(layerId);
 
             return ResultCode.Success;
         }
@@ -35,8 +41,6 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
         // CreateStrayLayer(u32, u64) -> (u64, u64, buffer<bytes, 6>)
         public ResultCode CreateStrayLayer(ServiceCtx context)
         {
-            Logger.PrintStub(LogClass.ServiceVi);
-
             return _applicationDisplayService.CreateStrayLayer(context);
         }
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
index a2b57e74..b7869519 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
@@ -1,13 +1,11 @@
 using ARMeilleure.Memory;
 using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.Kernel.Common;
+using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
 using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService;
 using System;
-using System.IO;
 using System.Text;
 
-using static Ryujinx.HLE.HOS.Services.SurfaceFlinger.Parcel;
-
 namespace Ryujinx.HLE.HOS.Services.Vi.RootService
 {
     class IApplicationDisplayService : IpcService
@@ -23,9 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
         // GetRelayService() -> object<nns::hosbinder::IHOSBinderDriver>
         public ResultCode GetRelayService(ServiceCtx context)
         {
-            MakeObject(context, new IHOSBinderDriver(
-                context.Device.System,
-                context.Device.Gpu.Renderer));
+            MakeObject(context, new HOSBinderDriverServer());
 
             return ResultCode.Success;
         }
@@ -52,9 +48,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
         // GetIndirectDisplayTransactionService() -> object<nns::hosbinder::IHOSBinderDriver>
         public ResultCode GetIndirectDisplayTransactionService(ServiceCtx context)
         {
-            MakeObject(context, new IHOSBinderDriver(
-                context.Device.System,
-                context.Device.Gpu.Renderer));
+            MakeObject(context, new HOSBinderDriverServer());
 
             return ResultCode.Success;
         }
@@ -71,8 +65,8 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
             context.Memory.WriteBytes(recBuffPtr, Encoding.ASCII.GetBytes("Default"));
             context.Memory.WriteInt64(recBuffPtr + 0x40, 0x1L);
             context.Memory.WriteInt64(recBuffPtr + 0x48, 0x1L);
-            context.Memory.WriteInt64(recBuffPtr + 0x50, 1920L);
-            context.Memory.WriteInt64(recBuffPtr + 0x58, 1080L);
+            context.Memory.WriteInt64(recBuffPtr + 0x50, 1280L);
+            context.Memory.WriteInt64(recBuffPtr + 0x58, 720L);
 
             context.ResponseData.Write(1L);
 
@@ -119,16 +113,24 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
         // OpenLayer(nn::vi::DisplayName, u64, nn::applet::AppletResourceUserId, pid) -> (u64, buffer<bytes, 6>)
         public ResultCode OpenLayer(ServiceCtx context)
         {
-            long layerId = context.RequestData.ReadInt64();
-            long userId  = context.RequestData.ReadInt64();
+            // TODO: support multi display.
+            byte[] displayName = context.RequestData.ReadBytes(0x40);
 
+            long layerId   = context.RequestData.ReadInt64();
+            long userId    = context.RequestData.ReadInt64();
             long parcelPtr = context.Request.ReceiveBuff[0].Position;
 
-            byte[] parcel = MakeIGraphicsBufferProducer(parcelPtr);
+            IBinder producer = context.Device.System.SurfaceFlinger.OpenLayer(context.Process, layerId);
+
+            Parcel parcel = new Parcel(0x28, 0x4);
+
+            parcel.WriteObject(producer, "dispdrv\0");
+
+            ReadOnlySpan<byte> parcelData = parcel.Finish();
 
-            context.Memory.WriteBytes(parcelPtr, parcel);
+            context.Memory.WriteBytes(parcelPtr, parcelData.ToArray());
 
-            context.ResponseData.Write((long)parcel.Length);
+            context.ResponseData.Write((long)parcelData.Length);
 
             return ResultCode.Success;
         }
@@ -139,6 +141,8 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
         {
             long layerId = context.RequestData.ReadInt64();
 
+            context.Device.System.SurfaceFlinger.CloseLayer(layerId);
+
             return ResultCode.Success;
         }
 
@@ -151,14 +155,21 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
 
             long parcelPtr = context.Request.ReceiveBuff[0].Position;
 
+            // TODO: support multi display.
             Display disp = _displays.GetData<Display>((int)displayId);
 
-            byte[] parcel = MakeIGraphicsBufferProducer(parcelPtr);
+            IBinder producer = context.Device.System.SurfaceFlinger.CreateLayer(context.Process, out long layerId);
+
+            Parcel parcel = new Parcel(0x28, 0x4);
+
+            parcel.WriteObject(producer, "dispdrv\0");
+
+            ReadOnlySpan<byte> parcelData = parcel.Finish();
 
-            context.Memory.WriteBytes(parcelPtr, parcel);
+            context.Memory.WriteBytes(parcelPtr, parcelData.ToArray());
 
-            context.ResponseData.Write(0L);
-            context.ResponseData.Write((long)parcel.Length);
+            context.ResponseData.Write(layerId);
+            context.ResponseData.Write((long)parcelData.Length);
 
             return ResultCode.Success;
         }
@@ -167,6 +178,10 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
         // DestroyStrayLayer(u64)
         public ResultCode DestroyStrayLayer(ServiceCtx context)
         {
+            long layerId = context.RequestData.ReadInt64();
+
+            context.Device.System.SurfaceFlinger.CloseLayer(layerId);
+
             return ResultCode.Success;
         }
 
@@ -236,36 +251,6 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService
             return ResultCode.Success;
         }
 
-        private byte[] MakeIGraphicsBufferProducer(long basePtr)
-        {
-            long id        = 0x20;
-            long cookiePtr = 0L;
-
-            using (MemoryStream ms = new MemoryStream())
-            {
-                BinaryWriter writer = new BinaryWriter(ms);
-
-                // flat_binder_object (size is 0x28)
-                writer.Write(2); //Type (BINDER_TYPE_WEAK_BINDER)
-                writer.Write(0); //Flags
-                writer.Write((int)(id >> 0));
-                writer.Write((int)(id >> 32));
-                writer.Write((int)(cookiePtr >> 0));
-                writer.Write((int)(cookiePtr >> 32));
-                writer.Write((byte)'d');
-                writer.Write((byte)'i');
-                writer.Write((byte)'s');
-                writer.Write((byte)'p');
-                writer.Write((byte)'d');
-                writer.Write((byte)'r');
-                writer.Write((byte)'v');
-                writer.Write((byte)'\0');
-                writer.Write(0L); //Pad
-
-                return MakeParcel(ms.ToArray(), new byte[] { 0, 0, 0, 0 });
-            }
-        }
-
         private string GetDisplayName(ServiceCtx context)
         {
             string name = string.Empty;