mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement ConvertScalingMode properly

Browse source
This commit is contained in:
gdkchan 2019-02-18 15:00:08 -03:00
commit 133ca72a01
2 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs
View file

@ -181,21 +181,28 @@ namespace Ryujinx.HLE.HOS.Services.Vi
public long ConvertScalingMode(ServiceCtx context)
{
SrcScalingMode scalingMode = (SrcScalingMode)context.RequestData.ReadInt32();
DstScalingMode? destScalingMode = ConvetScalingModeImpl(scalingMode);
if (!destScalingMode.HasValue)
if (scalingMode > SrcScalingMode.PreserveAspectRatio)
{
//Scaling mode out of the range of valid values.
return MakeError(ErrorModule.Vi, 1);
}
context.ResponseData.Write((ulong)destScalingMode);
if (scalingMode != SrcScalingMode.ScaleAndCrop &&
scalingMode != SrcScalingMode.PreserveAspectRatio)
{
//Invalid scaling mode specified.
return MakeError(ErrorModule.Vi, 6);
}
context.ResponseData.Write((ulong)ConvetScalingMode(scalingMode));
return 0;
}
private DstScalingMode? ConvetScalingModeImpl(SrcScalingMode srcScalingMode)
private DstScalingMode ConvetScalingMode(SrcScalingMode source)
{
switch (srcScalingMode)
switch (source)
{
case SrcScalingMode.None: return DstScalingMode.None;
case SrcScalingMode.Freeze: return DstScalingMode.Freeze;
@ -204,7 +211,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi
case SrcScalingMode.PreserveAspectRatio: return DstScalingMode.PreserveAspectRatio;
}
return null;
throw new ArgumentException($"Invalid scaling mode \"{source}\" specified.");
}
public long GetDisplayVSyncEvent(ServiceCtx context)

14
Ryujinx.HLE/HOS/Services/Vi/ScalingMode.cs
View file

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Ryujinx.HLE.HOS.Services.Vi
namespace Ryujinx.HLE.HOS.Services.Vi
{
enum SrcScalingMode
{
@ -15,10 +11,10 @@ namespace Ryujinx.HLE.HOS.Services.Vi
enum DstScalingMode
{
None = 0,
Freeze = 1,
ScaleToWindow = 2,
ScaleAndCrop = 3,
ScaleToWindow = 0,
ScaleAndCrop = 1,
None = 2,
Freeze = 3,
PreserveAspectRatio = 4
}
}