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

Return a nullable enum from ConvetScalingMode

Browse source
This commit is contained in:
gdkchan 2019-02-18 21:03:21 -03:00
commit b9f5342d87
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -182,7 +182,9 @@ namespace Ryujinx.HLE.HOS.Services.Vi
{ {
SrcScalingMode scalingMode = (SrcScalingMode)context.RequestData.ReadInt32(); SrcScalingMode scalingMode = (SrcScalingMode)context.RequestData.ReadInt32();
if (scalingMode > SrcScalingMode.PreserveAspectRatio) DstScalingMode? convertedScalingMode = ConvetScalingMode(scalingMode);
if (!convertedScalingMode.HasValue)
{ {
//Scaling mode out of the range of valid values. //Scaling mode out of the range of valid values.
return MakeError(ErrorModule.Vi, 1); return MakeError(ErrorModule.Vi, 1);
@ -200,7 +202,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi
return 0; return 0;
} }
private DstScalingMode ConvetScalingMode(SrcScalingMode source) private DstScalingMode? ConvetScalingMode(SrcScalingMode source)
{ {
switch (source) switch (source)
{ {
@ -211,7 +213,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi
case SrcScalingMode.PreserveAspectRatio: return DstScalingMode.PreserveAspectRatio; case SrcScalingMode.PreserveAspectRatio: return DstScalingMode.PreserveAspectRatio;
} }
throw new ArgumentException($"Invalid scaling mode \"{source}\" specified."); return null;
} }
public long GetDisplayVSyncEvent(ServiceCtx context) public long GetDisplayVSyncEvent(ServiceCtx context)