aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService
diff options
context:
space:
mode:
authorAc_K <Acoustik666@gmail.com>2021-09-19 12:57:39 +0200
committerGitHub <noreply@github.com>2021-09-19 12:57:39 +0200
commit40d1acd1982705224413bc882f6ae25d4bf8ee1a (patch)
tree9894e6bb40253952caecd467beead655a378d6aa /Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService
parente17eb7bfafdd95084baea8e9f3dc77ee3f755347 (diff)
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
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService')
-rw-r--r--Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/AndroidSurfaceComposerClient.cs19
-rw-r--r--Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/Display.cs12
-rw-r--r--Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs14
-rw-r--r--Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs11
-rw-r--r--Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/Types/DisplayInfo.cs16
5 files changed, 57 insertions, 15 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/AndroidSurfaceComposerClient.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/AndroidSurfaceComposerClient.cs
new file mode 100644
index 00000000..1fa99e65
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/AndroidSurfaceComposerClient.cs
@@ -0,0 +1,19 @@
+namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
+{
+ static class AndroidSurfaceComposerClient
+ {
+ // NOTE: This is android::SurfaceComposerClient::getDisplayInfo.
+ public static (ulong, ulong) GetDisplayInfo(ServiceCtx context, ulong displayId = 0)
+ {
+ // TODO: This need to be REd, it should returns the driver resolution and more.
+ if (context.Device.System.State.DockedMode)
+ {
+ return (1920, 1080);
+ }
+ else
+ {
+ return (1280, 720);
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/Display.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/Display.cs
deleted file mode 100644
index 47c7b2ae..00000000
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/Display.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Vi
-{
- class Display
- {
- public string Name { get; private set; }
-
- public Display(string name)
- {
- Name = name;
- }
- }
-} \ 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 6cc103a0..fdab0f1b 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs
@@ -11,6 +11,20 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
_applicationDisplayService = applicationDisplayService;
}
+ [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;
+ }
+
[CommandHipc(2010)]
// CreateManagedLayer(u32, u64, nn::applet::AppletResourceUserId) -> u64
public ResultCode CreateManagedLayer(ServiceCtx context)
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs
index e82099b1..82dd6af6 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs
@@ -42,12 +42,17 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
// GetDisplayMode(u64) -> nn::vi::DisplayModeInfo
public ResultCode GetDisplayMode(ServiceCtx context)
{
- // TODO: De-hardcode resolution.
- context.ResponseData.Write(1280);
- context.ResponseData.Write(720);
+ ulong displayId = context.RequestData.ReadUInt64();
+
+ (ulong width, ulong height) = AndroidSurfaceComposerClient.GetDisplayInfo(context, displayId);
+
+ context.ResponseData.Write((uint)width);
+ context.ResponseData.Write((uint)height);
context.ResponseData.Write(60.0f);
context.ResponseData.Write(0);
+ Logger.Stub?.PrintStub(LogClass.ServiceVi);
+
return ResultCode.Success;
}
}
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/Types/DisplayInfo.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/Types/DisplayInfo.cs
new file mode 100644
index 00000000..06309da0
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/Types/DisplayInfo.cs
@@ -0,0 +1,16 @@
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService.Types
+{
+ [StructLayout(LayoutKind.Sequential, Size = 0x60)]
+ struct DisplayInfo
+ {
+ public Array40<byte> Name;
+ public bool LayerLimitEnabled;
+ public Array7<byte> Padding;
+ public ulong LayerLimitMax;
+ public ulong Width;
+ public ulong Height;
+ }
+} \ No newline at end of file