mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-03 04:07:17 +01:00
36749c358d
* 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
273 lines
9.0 KiB
C#
273 lines
9.0 KiB
C#
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.Text;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.Vi.RootService
|
|
{
|
|
class IApplicationDisplayService : IpcService
|
|
{
|
|
private IdDictionary _displays;
|
|
|
|
public IApplicationDisplayService()
|
|
{
|
|
_displays = new IdDictionary();
|
|
}
|
|
|
|
[Command(100)]
|
|
// GetRelayService() -> object<nns::hosbinder::IHOSBinderDriver>
|
|
public ResultCode GetRelayService(ServiceCtx context)
|
|
{
|
|
MakeObject(context, new HOSBinderDriverServer());
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(101)]
|
|
// GetSystemDisplayService() -> object<nn::visrv::sf::ISystemDisplayService>
|
|
public ResultCode GetSystemDisplayService(ServiceCtx context)
|
|
{
|
|
MakeObject(context, new ISystemDisplayService(this));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(102)]
|
|
// GetManagerDisplayService() -> object<nn::visrv::sf::IManagerDisplayService>
|
|
public ResultCode GetManagerDisplayService(ServiceCtx context)
|
|
{
|
|
MakeObject(context, new IManagerDisplayService(this));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(103)] // 2.0.0+
|
|
// GetIndirectDisplayTransactionService() -> object<nns::hosbinder::IHOSBinderDriver>
|
|
public ResultCode GetIndirectDisplayTransactionService(ServiceCtx context)
|
|
{
|
|
MakeObject(context, new HOSBinderDriverServer());
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(1000)]
|
|
// ListDisplays() -> (u64, buffer<nn::vi::DisplayInfo, 6>)
|
|
public ResultCode ListDisplays(ServiceCtx context)
|
|
{
|
|
long recBuffPtr = context.Request.ReceiveBuff[0].Position;
|
|
|
|
MemoryHelper.FillWithZeros(context.Memory, recBuffPtr, 0x60);
|
|
|
|
// Add only the default display to buffer
|
|
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, 1280L);
|
|
context.Memory.WriteInt64(recBuffPtr + 0x58, 720L);
|
|
|
|
context.ResponseData.Write(1L);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(1010)]
|
|
// OpenDisplay(nn::vi::DisplayName) -> u64
|
|
public ResultCode OpenDisplay(ServiceCtx context)
|
|
{
|
|
string name = GetDisplayName(context);
|
|
|
|
long displayId = _displays.Add(new Display(name));
|
|
|
|
context.ResponseData.Write(displayId);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(1020)]
|
|
// CloseDisplay(u64)
|
|
public ResultCode CloseDisplay(ServiceCtx context)
|
|
{
|
|
int displayId = context.RequestData.ReadInt32();
|
|
|
|
_displays.Delete(displayId);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(1102)]
|
|
// GetDisplayResolution(u64) -> (u64, u64)
|
|
public ResultCode GetDisplayResolution(ServiceCtx context)
|
|
{
|
|
long displayId = context.RequestData.ReadInt32();
|
|
|
|
context.ResponseData.Write(1280);
|
|
context.ResponseData.Write(720);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(2020)]
|
|
// OpenLayer(nn::vi::DisplayName, u64, nn::applet::AppletResourceUserId, pid) -> (u64, buffer<bytes, 6>)
|
|
public ResultCode OpenLayer(ServiceCtx context)
|
|
{
|
|
// 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;
|
|
|
|
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, parcelData.ToArray());
|
|
|
|
context.ResponseData.Write((long)parcelData.Length);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(2021)]
|
|
// CloseLayer(u64)
|
|
public ResultCode CloseLayer(ServiceCtx context)
|
|
{
|
|
long layerId = context.RequestData.ReadInt64();
|
|
|
|
context.Device.System.SurfaceFlinger.CloseLayer(layerId);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(2030)]
|
|
// CreateStrayLayer(u32, u64) -> (u64, u64, buffer<bytes, 6>)
|
|
public ResultCode CreateStrayLayer(ServiceCtx context)
|
|
{
|
|
long layerFlags = context.RequestData.ReadInt64();
|
|
long displayId = context.RequestData.ReadInt64();
|
|
|
|
long parcelPtr = context.Request.ReceiveBuff[0].Position;
|
|
|
|
// TODO: support multi display.
|
|
Display disp = _displays.GetData<Display>((int)displayId);
|
|
|
|
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, parcelData.ToArray());
|
|
|
|
context.ResponseData.Write(layerId);
|
|
context.ResponseData.Write((long)parcelData.Length);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(2031)]
|
|
// DestroyStrayLayer(u64)
|
|
public ResultCode DestroyStrayLayer(ServiceCtx context)
|
|
{
|
|
long layerId = context.RequestData.ReadInt64();
|
|
|
|
context.Device.System.SurfaceFlinger.CloseLayer(layerId);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(2101)]
|
|
// SetLayerScalingMode(u32, u64)
|
|
public ResultCode SetLayerScalingMode(ServiceCtx context)
|
|
{
|
|
int scalingMode = context.RequestData.ReadInt32();
|
|
long unknown = context.RequestData.ReadInt64();
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(2102)] // 5.0.0+
|
|
// ConvertScalingMode(unknown) -> unknown
|
|
public ResultCode ConvertScalingMode(ServiceCtx context)
|
|
{
|
|
SourceScalingMode scalingMode = (SourceScalingMode)context.RequestData.ReadInt32();
|
|
|
|
DestinationScalingMode? convertedScalingMode = ConvertScalingMode(scalingMode);
|
|
|
|
if (!convertedScalingMode.HasValue)
|
|
{
|
|
// Scaling mode out of the range of valid values.
|
|
return ResultCode.InvalidArguments;
|
|
}
|
|
|
|
if (scalingMode != SourceScalingMode.ScaleToWindow &&
|
|
scalingMode != SourceScalingMode.PreserveAspectRatio)
|
|
{
|
|
// Invalid scaling mode specified.
|
|
return ResultCode.InvalidScalingMode;
|
|
}
|
|
|
|
context.ResponseData.Write((ulong)convertedScalingMode);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
private DestinationScalingMode? ConvertScalingMode(SourceScalingMode source)
|
|
{
|
|
switch (source)
|
|
{
|
|
case SourceScalingMode.None: return DestinationScalingMode.None;
|
|
case SourceScalingMode.Freeze: return DestinationScalingMode.Freeze;
|
|
case SourceScalingMode.ScaleAndCrop: return DestinationScalingMode.ScaleAndCrop;
|
|
case SourceScalingMode.ScaleToWindow: return DestinationScalingMode.ScaleToWindow;
|
|
case SourceScalingMode.PreserveAspectRatio: return DestinationScalingMode.PreserveAspectRatio;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
[Command(5202)]
|
|
// GetDisplayVsyncEvent(u64) -> handle<copy>
|
|
public ResultCode GetDisplayVSyncEvent(ServiceCtx context)
|
|
{
|
|
string name = GetDisplayName(context);
|
|
|
|
if (context.Process.HandleTable.GenerateHandle(context.Device.System.VsyncEvent.ReadableEvent, out int handle) != KernelResult.Success)
|
|
{
|
|
throw new InvalidOperationException("Out of handles!");
|
|
}
|
|
|
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(handle);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
private string GetDisplayName(ServiceCtx context)
|
|
{
|
|
string name = string.Empty;
|
|
|
|
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 name;
|
|
}
|
|
}
|
|
} |