2018-10-17 19:15:50 +02:00
|
|
|
using Ryujinx.Common.Logging;
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2019-09-19 02:45:11 +02:00
|
|
|
namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2018-03-19 19:58:46 +01:00
|
|
|
class IManagerDisplayService : IpcService
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2020-12-02 00:23:43 +01:00
|
|
|
private IApplicationDisplayService _applicationDisplayService;
|
2018-02-10 01:14:55 +01:00
|
|
|
|
2019-04-26 00:57:18 +02:00
|
|
|
public IManagerDisplayService(IApplicationDisplayService applicationDisplayService)
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2019-07-12 03:13:43 +02:00
|
|
|
_applicationDisplayService = applicationDisplayService;
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
|
|
|
|
vi: Unify resolutions values and accurate implementation of them. (#2640)
* vi: Unify resolutions values and accurate implementation of them.
To continue what was made in #2618, I've REd `vi` service a bit. Now values and checks related to displays are more accurate.
- `am` GetDefaultDisplayResolution / GetDefaultDisplayResolutionChangeEvent have more informations on what the service does.
- `vi:u/vi:m/vi:s` GetDisplayService are now accurate.
- `IApplicationDisplay` GetRelayService, GetSystemDisplayService, GetManagerDisplayService, GetIndirectDisplayTransactionService, ListDisplays, OpenDisplay, OpenDefaultDisplay, CloseDisplay, GetDisplayResolution are now properly implemented.
- Some other calls are cleaned or have extra checks accordingly to RE.
Additionnaly, `IFriendService` have some wrong aligned things, and `pm:info` service placeholder was missing.
* just use _openedDisplayInfo.Remove()
* use context.Memory.Fill()
* fix some casting
* remove unneeded comment
* cleanup
* uses TryAdd
* displayId > ulong
* GetDisplayResolution > ulong
* UL
2021-09-19 12:57:39 +02:00
|
|
|
[CommandHipc(1102)]
|
|
|
|
// GetDisplayResolution(u64 display_id) -> (u64 width, u64 height)
|
|
|
|
public ResultCode GetDisplayResolution(ServiceCtx context)
|
|
|
|
{
|
|
|
|
ulong displayId = context.RequestData.ReadUInt64();
|
|
|
|
|
|
|
|
(ulong width, ulong height) = AndroidSurfaceComposerClient.GetDisplayInfo(context, displayId);
|
|
|
|
|
|
|
|
context.ResponseData.Write(width);
|
|
|
|
context.ResponseData.Write(height);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2010)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// CreateManagedLayer(u32, u64, nn::applet::AppletResourceUserId) -> u64
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode CreateManagedLayer(ServiceCtx context)
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2020-12-02 00:23:43 +01:00
|
|
|
long layerFlags = context.RequestData.ReadInt64();
|
|
|
|
long displayId = context.RequestData.ReadInt64();
|
|
|
|
long appletResourceUserId = context.RequestData.ReadInt64();
|
2020-04-22 06:10:27 +02:00
|
|
|
|
2020-12-02 00:23:43 +01:00
|
|
|
long pid = context.Device.System.AppletState.AppletResourceUserIds.GetData<long>((int)appletResourceUserId);
|
|
|
|
|
|
|
|
context.Device.System.SurfaceFlinger.CreateLayer(pid, out long layerId);
|
2021-04-13 02:56:16 +02:00
|
|
|
context.Device.System.SurfaceFlinger.SetRenderLayer(layerId);
|
2018-08-17 01:47:36 +02:00
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
context.ResponseData.Write(layerId);
|
2018-08-17 01:47:36 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2011)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// DestroyManagedLayer(u64)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode DestroyManagedLayer(ServiceCtx context)
|
2018-03-06 21:27:50 +01:00
|
|
|
{
|
2020-04-22 06:10:27 +02:00
|
|
|
long layerId = context.RequestData.ReadInt64();
|
|
|
|
|
|
|
|
context.Device.System.SurfaceFlinger.CloseLayer(layerId);
|
2018-08-17 01:47:36 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-03-06 21:27:50 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2012)] // 7.0.0+
|
2019-07-12 03:13:43 +02:00
|
|
|
// CreateStrayLayer(u32, u64) -> (u64, u64, buffer<bytes, 6>)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode CreateStrayLayer(ServiceCtx context)
|
2019-07-12 03:13:43 +02:00
|
|
|
{
|
|
|
|
return _applicationDisplayService.CreateStrayLayer(context);
|
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(6000)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// AddToLayerStack(u32, u64)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode AddToLayerStack(ServiceCtx context)
|
2018-02-10 01:14:55 +01:00
|
|
|
{
|
2020-08-04 01:32:53 +02:00
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceVi);
|
2018-08-17 01:47:36 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-05-11 04:40:52 +02:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(6002)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// SetLayerVisibility(b8, u64)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode SetLayerVisibility(ServiceCtx context)
|
2018-05-11 04:40:52 +02:00
|
|
|
{
|
2020-08-04 01:32:53 +02:00
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceVi);
|
2018-08-17 01:47:36 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|