aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService
diff options
context:
space:
mode:
authorThog <me@thog.eu>2020-04-22 06:10:27 +0200
committerGitHub <noreply@github.com>2020-04-22 14:10:27 +1000
commit36749c358d85dd0bc7f1e4a36a0b607fc0f724d5 (patch)
tree0c24eb54082b80e8f15aa8138a3e85c5c4e89675 /Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService
parent03711dd7b5d44e20fb45c728803ea6b9599dec87 (diff)
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
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService')
-rw-r--r--Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs99
-rw-r--r--Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs14
2 files changed, 9 insertions, 104 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);
}