2020-07-23 12:25:41 +02:00
|
|
|
using Ryujinx.Common;
|
2021-01-11 19:27:55 +01:00
|
|
|
using Ryujinx.Common.Logging;
|
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
|
|
|
using Ryujinx.Common.Memory;
|
2020-05-04 00:54:50 +02:00
|
|
|
using Ryujinx.Cpu;
|
2018-08-17 01:47:36 +02:00
|
|
|
using Ryujinx.HLE.HOS.Ipc;
|
2018-12-18 06:33:36 +01:00
|
|
|
using Ryujinx.HLE.HOS.Kernel.Common;
|
2020-04-22 06:10:27 +02:00
|
|
|
using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
|
2019-09-19 02:45:11 +02:00
|
|
|
using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService;
|
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
|
|
|
using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService.Types;
|
|
|
|
using Ryujinx.HLE.HOS.Services.Vi.Types;
|
2018-09-23 20:11:46 +02:00
|
|
|
using System;
|
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
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Runtime.CompilerServices;
|
2018-07-24 23:38:44 +02:00
|
|
|
using System.Text;
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-09-19 02:45:11 +02:00
|
|
|
namespace Ryujinx.HLE.HOS.Services.Vi.RootService
|
2018-02-05 00:08:20 +01:00
|
|
|
{
|
2018-03-19 19:58:46 +01:00
|
|
|
class IApplicationDisplayService : IpcService
|
2018-02-05 00:08:20 +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
|
|
|
private readonly ViServiceType _serviceType;
|
|
|
|
|
|
|
|
private readonly List<DisplayInfo> _displayInfo;
|
|
|
|
private readonly Dictionary<ulong, DisplayInfo> _openDisplayInfo;
|
2020-12-02 00:23:43 +01:00
|
|
|
|
|
|
|
private int _vsyncEventHandle;
|
2018-03-12 05:04:52 +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
|
|
|
public IApplicationDisplayService(ViServiceType serviceType)
|
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
|
|
|
_serviceType = serviceType;
|
|
|
|
_displayInfo = new List<DisplayInfo>();
|
|
|
|
_openDisplayInfo = new Dictionary<ulong, DisplayInfo>();
|
|
|
|
|
|
|
|
void AddDisplayInfo(string name, bool layerLimitEnabled, ulong layerLimitMax, ulong width, ulong height)
|
|
|
|
{
|
|
|
|
DisplayInfo displayInfo = new DisplayInfo()
|
|
|
|
{
|
|
|
|
Name = new Array40<byte>(),
|
|
|
|
LayerLimitEnabled = layerLimitEnabled,
|
|
|
|
Padding = new Array7<byte>(),
|
|
|
|
LayerLimitMax = layerLimitMax,
|
|
|
|
Width = width,
|
|
|
|
Height = height
|
|
|
|
};
|
|
|
|
|
|
|
|
Encoding.ASCII.GetBytes(name).AsSpan().CopyTo(displayInfo.Name.ToSpan());
|
|
|
|
|
|
|
|
_displayInfo.Add(displayInfo);
|
|
|
|
}
|
|
|
|
|
|
|
|
AddDisplayInfo("Default", true, 1, 1920, 1080);
|
|
|
|
AddDisplayInfo("External", true, 1, 1920, 1080);
|
|
|
|
AddDisplayInfo("Edid", true, 1, 0, 0);
|
|
|
|
AddDisplayInfo("Internal", true, 1, 1920, 1080);
|
|
|
|
AddDisplayInfo("Null", false, 0, 1920, 1080);
|
2018-02-10 01:14:55 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(100)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// GetRelayService() -> object<nns::hosbinder::IHOSBinderDriver>
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetRelayService(ServiceCtx context)
|
2018-02-05 00:08:20 +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
|
|
|
// FIXME: Should be _serviceType != ViServiceType.Application but guests crashes if we do this check.
|
|
|
|
if (_serviceType > ViServiceType.System)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidRange;
|
|
|
|
}
|
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
MakeObject(context, new HOSBinderDriverServer());
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-05 00:08:20 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(101)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// GetSystemDisplayService() -> object<nn::visrv::sf::ISystemDisplayService>
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetSystemDisplayService(ServiceCtx context)
|
2018-02-05 00:08:20 +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
|
|
|
// FIXME: Should be _serviceType == ViServiceType.System but guests crashes if we do this check.
|
|
|
|
if (_serviceType > ViServiceType.System)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidRange;
|
|
|
|
}
|
|
|
|
|
2019-01-05 22:26:16 +01:00
|
|
|
MakeObject(context, new ISystemDisplayService(this));
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-05 00:08:20 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(102)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// GetManagerDisplayService() -> object<nn::visrv::sf::IManagerDisplayService>
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetManagerDisplayService(ServiceCtx context)
|
2018-02-05 00:08:20 +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
|
|
|
if (_serviceType > ViServiceType.System)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidRange;
|
|
|
|
}
|
|
|
|
|
2019-04-26 00:57:18 +02:00
|
|
|
MakeObject(context, new IManagerDisplayService(this));
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-05 00:08:20 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(103)] // 2.0.0+
|
2019-07-12 03:13:43 +02:00
|
|
|
// GetIndirectDisplayTransactionService() -> object<nns::hosbinder::IHOSBinderDriver>
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetIndirectDisplayTransactionService(ServiceCtx context)
|
2018-02-07 00:28:32 +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
|
|
|
if (_serviceType > ViServiceType.System)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidRange;
|
|
|
|
}
|
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
MakeObject(context, new HOSBinderDriverServer());
|
2018-02-07 00:28:32 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-07 00:28:32 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(1000)]
|
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
|
|
|
// ListDisplays() -> (u64 count, buffer<nn::vi::DisplayInfo, 6>)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode ListDisplays(ServiceCtx context)
|
2018-07-24 23:38:44 +02: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
|
|
|
ulong displayInfoBuffer = context.Request.ReceiveBuff[0].Position;
|
2018-07-24 23:38:44 +02: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
|
|
|
// TODO: Determine when more than one display is needed.
|
|
|
|
ulong displayCount = 1;
|
2018-07-24 23:38:44 +02: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
|
|
|
for (int i = 0; i < (int)displayCount; i++)
|
|
|
|
{
|
|
|
|
context.Memory.Fill(displayInfoBuffer + (ulong)(i * Unsafe.SizeOf<DisplayInfo>()), (ulong)(Unsafe.SizeOf<DisplayInfo>()), 0x00);
|
|
|
|
context.Memory.Write(displayInfoBuffer, _displayInfo[i]);
|
|
|
|
}
|
2018-07-24 23:38:44 +02: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
|
|
|
context.ResponseData.Write(displayCount);
|
2018-07-24 23:38:44 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-07-24 23:38:44 +02:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(1010)]
|
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
|
|
|
// OpenDisplay(nn::vi::DisplayName) -> u64 display_id
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode OpenDisplay(ServiceCtx context)
|
2018-02-05 00:08:20 +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
|
|
|
string name = "";
|
|
|
|
|
|
|
|
for (int index = 0; index < 8 && context.RequestData.BaseStream.Position < context.RequestData.BaseStream.Length; index++)
|
|
|
|
{
|
|
|
|
byte chr = context.RequestData.ReadByte();
|
|
|
|
|
|
|
|
if (chr >= 0x20 && chr < 0x7f)
|
|
|
|
{
|
|
|
|
name += (char)chr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return OpenDisplayImpl(context, name);
|
|
|
|
}
|
|
|
|
|
|
|
|
[CommandHipc(1011)]
|
|
|
|
// OpenDefaultDisplay() -> u64 display_id
|
|
|
|
public ResultCode OpenDefaultDisplay(ServiceCtx context)
|
|
|
|
{
|
|
|
|
return OpenDisplayImpl(context, "Default");
|
|
|
|
}
|
2018-02-05 00:08:20 +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
|
|
|
private ResultCode OpenDisplayImpl(ServiceCtx context, string name)
|
|
|
|
{
|
|
|
|
if (name == "")
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidValue;
|
|
|
|
}
|
2018-02-05 00:08:20 +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
|
|
|
int displayId = _displayInfo.FindIndex(display => Encoding.ASCII.GetString(display.Name.ToSpan()).Trim('\0') == name);
|
|
|
|
|
|
|
|
if (displayId == -1)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidValue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!_openDisplayInfo.TryAdd((ulong)displayId, _displayInfo[displayId]))
|
|
|
|
{
|
|
|
|
return ResultCode.AlreadyOpened;
|
|
|
|
}
|
|
|
|
|
|
|
|
context.ResponseData.Write((ulong)displayId);
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-05 00:08:20 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(1020)]
|
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
|
|
|
// CloseDisplay(u64 display_id)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode CloseDisplay(ServiceCtx context)
|
2018-03-06 14:25:26 +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
|
|
|
ulong displayId = context.RequestData.ReadUInt64();
|
2018-03-06 14:25:26 +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
|
|
|
if (!_openDisplayInfo.Remove(displayId))
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidValue;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
2018-03-06 14:25:26 +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(1101)]
|
|
|
|
// SetDisplayEnabled(u32 enabled_bool, u64 display_id)
|
|
|
|
public ResultCode SetDisplayEnabled(ServiceCtx context)
|
|
|
|
{
|
|
|
|
// NOTE: Stubbed in original service.
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-03-06 14:25:26 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(1102)]
|
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
|
|
|
// GetDisplayResolution(u64 display_id) -> (u64 width, u64 height)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetDisplayResolution(ServiceCtx context)
|
2018-04-05 00:16:59 +02: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
|
|
|
// NOTE: Not used in original service.
|
|
|
|
// ulong displayId = context.RequestData.ReadUInt64();
|
|
|
|
|
|
|
|
// NOTE: Returns ResultCode.InvalidArguments if width and height pointer are null, doesn't occur in our case.
|
2018-04-05 00:16:59 +02: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
|
|
|
// NOTE: Values are hardcoded in original service.
|
|
|
|
context.ResponseData.Write(1280UL); // Width
|
|
|
|
context.ResponseData.Write(720UL); // Height
|
2018-04-05 00:16:59 +02:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-04-05 00:16:59 +02:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2020)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// OpenLayer(nn::vi::DisplayName, u64, nn::applet::AppletResourceUserId, pid) -> (u64, buffer<bytes, 6>)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode OpenLayer(ServiceCtx context)
|
2018-02-05 00:08:20 +01:00
|
|
|
{
|
2020-04-22 06:10:27 +02:00
|
|
|
// TODO: support multi display.
|
|
|
|
byte[] displayName = context.RequestData.ReadBytes(0x40);
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2021-04-24 12:16:01 +02:00
|
|
|
long layerId = context.RequestData.ReadInt64();
|
|
|
|
long userId = context.RequestData.ReadInt64();
|
|
|
|
ulong parcelPtr = context.Request.ReceiveBuff[0].Position;
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2020-12-02 00:23:43 +01:00
|
|
|
IBinder producer = context.Device.System.SurfaceFlinger.OpenLayer(context.Request.HandleDesc.PId, layerId);
|
2020-04-22 06:10:27 +02:00
|
|
|
|
2021-04-13 02:56:16 +02:00
|
|
|
context.Device.System.SurfaceFlinger.SetRenderLayer(layerId);
|
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
Parcel parcel = new Parcel(0x28, 0x4);
|
|
|
|
|
|
|
|
parcel.WriteObject(producer, "dispdrv\0");
|
|
|
|
|
|
|
|
ReadOnlySpan<byte> parcelData = parcel.Finish();
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2021-04-24 12:16:01 +02:00
|
|
|
context.Memory.Write(parcelPtr, parcelData);
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
context.ResponseData.Write((long)parcelData.Length);
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-05 00:08:20 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2021)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// CloseLayer(u64)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode CloseLayer(ServiceCtx context)
|
2018-03-06 21:27:50 +01:00
|
|
|
{
|
2018-12-06 12:16:24 +01:00
|
|
|
long layerId = context.RequestData.ReadInt64();
|
2018-03-12 05:04:52 +01:00
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
context.Device.System.SurfaceFlinger.CloseLayer(layerId);
|
|
|
|
|
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(2030)]
|
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)
|
2018-02-05 00:08:20 +01:00
|
|
|
{
|
2018-12-06 12:16:24 +01:00
|
|
|
long layerFlags = context.RequestData.ReadInt64();
|
|
|
|
long displayId = context.RequestData.ReadInt64();
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2021-04-24 12:16:01 +02:00
|
|
|
ulong parcelPtr = context.Request.ReceiveBuff[0].Position;
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
// TODO: support multi display.
|
2020-12-02 00:23:43 +01:00
|
|
|
IBinder producer = context.Device.System.SurfaceFlinger.CreateLayer(0, out long layerId);
|
2020-04-22 06:10:27 +02:00
|
|
|
|
2021-04-13 02:56:16 +02:00
|
|
|
context.Device.System.SurfaceFlinger.SetRenderLayer(layerId);
|
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
Parcel parcel = new Parcel(0x28, 0x4);
|
|
|
|
|
|
|
|
parcel.WriteObject(producer, "dispdrv\0");
|
|
|
|
|
|
|
|
ReadOnlySpan<byte> parcelData = parcel.Finish();
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2021-04-24 12:16:01 +02:00
|
|
|
context.Memory.Write(parcelPtr, parcelData);
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2020-04-22 06:10:27 +02:00
|
|
|
context.ResponseData.Write(layerId);
|
|
|
|
context.ResponseData.Write((long)parcelData.Length);
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-05 00:08:20 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2031)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// DestroyStrayLayer(u64)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode DestroyStrayLayer(ServiceCtx context)
|
2018-03-12 05:04:52 +01:00
|
|
|
{
|
2020-04-22 06:10:27 +02:00
|
|
|
long layerId = context.RequestData.ReadInt64();
|
|
|
|
|
|
|
|
context.Device.System.SurfaceFlinger.CloseLayer(layerId);
|
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-03-12 05:04:52 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2101)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// SetLayerScalingMode(u32, u64)
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode SetLayerScalingMode(ServiceCtx context)
|
2018-02-05 00:08:20 +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
|
|
|
/*
|
|
|
|
uint sourceScalingMode = context.RequestData.ReadUInt32();
|
|
|
|
ulong layerId = context.RequestData.ReadUInt64();
|
|
|
|
*/
|
|
|
|
// NOTE: Original service converts SourceScalingMode to DestinationScalingMode but does nothing with the converted value.
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-05 00:08:20 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2102)] // 5.0.0+
|
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
|
|
|
// ConvertScalingMode(u32 source_scaling_mode) -> u64 destination_scaling_mode
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode ConvertScalingMode(ServiceCtx context)
|
2019-02-15 05:47:40 +01:00
|
|
|
{
|
2019-09-19 02:45:11 +02:00
|
|
|
SourceScalingMode scalingMode = (SourceScalingMode)context.RequestData.ReadInt32();
|
2019-02-15 05:47:40 +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
|
|
|
DestinationScalingMode? convertedScalingMode = scalingMode switch
|
|
|
|
{
|
|
|
|
SourceScalingMode.None => DestinationScalingMode.None,
|
|
|
|
SourceScalingMode.Freeze => DestinationScalingMode.Freeze,
|
|
|
|
SourceScalingMode.ScaleAndCrop => DestinationScalingMode.ScaleAndCrop,
|
|
|
|
SourceScalingMode.ScaleToWindow => DestinationScalingMode.ScaleToWindow,
|
|
|
|
SourceScalingMode.PreserveAspectRatio => DestinationScalingMode.PreserveAspectRatio,
|
|
|
|
_ => null,
|
|
|
|
};
|
2019-02-19 01:12:53 +01:00
|
|
|
|
|
|
|
if (!convertedScalingMode.HasValue)
|
2019-02-15 05:47:40 +01:00
|
|
|
{
|
2019-07-02 04:39:22 +02:00
|
|
|
// Scaling mode out of the range of valid values.
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.InvalidArguments;
|
2019-02-15 05:47:40 +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
|
|
|
if (scalingMode != SourceScalingMode.ScaleToWindow && scalingMode != SourceScalingMode.PreserveAspectRatio)
|
2019-02-19 01:12:53 +01:00
|
|
|
{
|
2019-07-02 04:39:22 +02:00
|
|
|
// Invalid scaling mode specified.
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.InvalidScalingMode;
|
2019-02-19 01:12:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
context.ResponseData.Write((ulong)convertedScalingMode);
|
2019-02-15 05:47:40 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2019-02-15 05:47:40 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2450)]
|
2021-01-11 19:27:55 +01:00
|
|
|
// GetIndirectLayerImageMap(s64 width, s64 height, u64 handle, nn::applet::AppletResourceUserId, pid) -> (s64, s64, buffer<bytes, 0x46>)
|
|
|
|
public ResultCode GetIndirectLayerImageMap(ServiceCtx context)
|
|
|
|
{
|
|
|
|
// The size of the layer buffer should be an aligned multiple of width * height
|
|
|
|
// because it was created using GetIndirectLayerImageRequiredMemoryInfo as a guide.
|
|
|
|
|
2021-04-24 12:16:01 +02:00
|
|
|
ulong layerBuffPosition = context.Request.ReceiveBuff[0].Position;
|
|
|
|
ulong layerBuffSize = context.Request.ReceiveBuff[0].Size;
|
2021-01-11 19:27:55 +01:00
|
|
|
|
|
|
|
// Fill the layer with zeros.
|
2021-04-24 12:16:01 +02:00
|
|
|
context.Memory.Fill(layerBuffPosition, layerBuffSize, 0x00);
|
2021-01-11 19:27:55 +01:00
|
|
|
|
|
|
|
Logger.Stub?.PrintStub(LogClass.ServiceVi);
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(2460)]
|
2020-07-23 12:25:41 +02:00
|
|
|
// GetIndirectLayerImageRequiredMemoryInfo(u64 width, u64 height) -> (u64 size, u64 alignment)
|
|
|
|
public ResultCode GetIndirectLayerImageRequiredMemoryInfo(ServiceCtx context)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
// Doesn't occur in our case.
|
|
|
|
if (sizePtr == null || address_alignmentPtr == null)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidArguments;
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
|
|
|
int width = (int)context.RequestData.ReadUInt64();
|
|
|
|
int height = (int)context.RequestData.ReadUInt64();
|
|
|
|
|
|
|
|
if (height < 0 || width < 0)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidLayerSize;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
// Doesn't occur in our case.
|
|
|
|
if (!service_initialized)
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidArguments;
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
|
|
|
|
const ulong defaultAlignment = 0x1000;
|
|
|
|
const ulong defaultSize = 0x20000;
|
|
|
|
|
2020-12-02 00:23:43 +01:00
|
|
|
// NOTE: The official service setup a A8B8G8R8 texture with a linear layout and then query its size.
|
|
|
|
// As we don't need this texture on the emulator, we can just simplify this logic and directly
|
2020-07-23 12:25:41 +02:00
|
|
|
// do a linear layout size calculation. (stride * height * bytePerPixel)
|
|
|
|
int pitch = BitUtils.AlignUp(BitUtils.DivRoundUp(width * 32, 8), 64);
|
|
|
|
int memorySize = pitch * BitUtils.AlignUp(height, 64);
|
|
|
|
ulong requiredMemorySize = (ulong)BitUtils.AlignUp(memorySize, (int)defaultAlignment);
|
|
|
|
ulong size = (requiredMemorySize + defaultSize - 1) / defaultSize * defaultSize;
|
|
|
|
|
|
|
|
context.ResponseData.Write(size);
|
|
|
|
context.ResponseData.Write(defaultAlignment);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ResultCode.Success;
|
|
|
|
}
|
|
|
|
|
2021-04-14 00:01:24 +02:00
|
|
|
[CommandHipc(5202)]
|
2019-07-12 03:13:43 +02:00
|
|
|
// GetDisplayVsyncEvent(u64) -> handle<copy>
|
2019-07-14 21:04:38 +02:00
|
|
|
public ResultCode GetDisplayVSyncEvent(ServiceCtx context)
|
2018-02-05 00:08:20 +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
|
|
|
ulong displayId = context.RequestData.ReadUInt64();
|
|
|
|
|
|
|
|
if (!_openDisplayInfo.ContainsKey(displayId))
|
|
|
|
{
|
|
|
|
return ResultCode.InvalidValue;
|
|
|
|
}
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2020-12-02 00:23:43 +01:00
|
|
|
if (_vsyncEventHandle == 0)
|
2018-09-23 20:11:46 +02:00
|
|
|
{
|
2020-12-02 00:23:43 +01:00
|
|
|
if (context.Process.HandleTable.GenerateHandle(context.Device.System.VsyncEvent.ReadableEvent, out _vsyncEventHandle) != KernelResult.Success)
|
|
|
|
{
|
|
|
|
throw new InvalidOperationException("Out of handles!");
|
|
|
|
}
|
2018-09-23 20:11:46 +02:00
|
|
|
}
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2020-12-02 00:23:43 +01:00
|
|
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_vsyncEventHandle);
|
2018-02-05 00:08:20 +01:00
|
|
|
|
2019-07-14 21:04:38 +02:00
|
|
|
return ResultCode.Success;
|
2018-02-05 00:08:20 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|