Compare commits

..

1 commit

Author SHA1 Message Date
GreemDev
26c391b0e5 Merge branch 'removal/ims' into 'master'
Make 'Ignore Missing Services' Debug-only

See merge request ryubing/ryujinx!16
2025-03-28 21:39:10 +00:00
2 changed files with 84 additions and 29 deletions

View file

@ -315,7 +315,7 @@ namespace Ryujinx.Headless
private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) => private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
new( new(
#if DEBUG
new HleConfiguration( new HleConfiguration(
options.DramSize, options.DramSize,
options.SystemLanguage, options.SystemLanguage,
@ -330,9 +330,7 @@ namespace Ryujinx.Headless
options.SystemTimeOffset, options.SystemTimeOffset,
options.SystemTimeZone, options.SystemTimeZone,
options.MemoryManagerMode, options.MemoryManagerMode,
#if DEBUG
options.IgnoreMissingServices, options.IgnoreMissingServices,
#endif
options.AspectRatio, options.AspectRatio,
options.AudioVolume, options.AudioVolume,
options.UseHypervisor ?? true, options.UseHypervisor ?? true,
@ -343,6 +341,31 @@ namespace Ryujinx.Headless
string.Empty, string.Empty,
options.CustomVSyncInterval options.CustomVSyncInterval
) )
#else
new HleConfiguration(
options.DramSize,
options.SystemLanguage,
options.SystemRegion,
options.VSyncMode,
!options.DisableDockedMode,
!options.DisablePTC,
options.EnableInternetAccess,
!options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
options.FsGlobalAccessLogMode,
options.SystemTimeOffset,
options.SystemTimeZone,
options.MemoryManagerMode,
options.AspectRatio,
options.AudioVolume,
options.UseHypervisor ?? true,
options.MultiplayerLanInterfaceId,
Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
false,
string.Empty,
string.Empty,
options.CustomVSyncInterval
)
#endif
.Configure( .Configure(
_virtualFileSystem, _virtualFileSystem,
_libHacHorizonManager, _libHacHorizonManager,

View file

@ -843,6 +843,7 @@ namespace Ryujinx.Ava.Systems.Configuration
} }
public HleConfiguration CreateHleConfiguration() => public HleConfiguration CreateHleConfiguration() =>
#if DEBUG
new( new(
System.DramSize, System.DramSize,
System.Language.Value.ToHLE(), System.Language.Value.ToHLE(),
@ -861,9 +862,7 @@ namespace Ryujinx.Ava.Systems.Configuration
: System.SystemTimeOffset, : System.SystemTimeOffset,
System.TimeZone, System.TimeZone,
System.MemoryManagerMode, System.MemoryManagerMode,
#if DEBUG
CommandLineState.IgnoreMissingServices, CommandLineState.IgnoreMissingServices,
#endif
Graphics.AspectRatio, Graphics.AspectRatio,
System.AudioVolume, System.AudioVolume,
System.UseHypervisor, System.UseHypervisor,
@ -874,5 +873,38 @@ namespace Ryujinx.Ava.Systems.Configuration
Instance.Multiplayer.GetLdnServer(), Instance.Multiplayer.GetLdnServer(),
Instance.Graphics.CustomVSyncInterval, Instance.Graphics.CustomVSyncInterval,
Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null); Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null);
#else
new(
System.DramSize,
System.Language.Value.ToHLE(),
System.Region.Value.ToHLE(),
Graphics.VSyncMode,
System.EnableDockedMode,
System.EnablePtc,
System.TickScalar,
System.EnableInternetAccess,
System.EnableFsIntegrityChecks
? IntegrityCheckLevel.ErrorOnInvalid
: IntegrityCheckLevel.None,
System.FsGlobalAccessLogMode,
System.MatchSystemTime
? 0
: System.SystemTimeOffset,
System.TimeZone,
System.MemoryManagerMode,
Graphics.AspectRatio,
System.AudioVolume,
System.UseHypervisor,
Multiplayer.LanInterfaceId,
Multiplayer.Mode,
Multiplayer.DisableP2p,
Multiplayer.LdnPassphrase,
Instance.Multiplayer.GetLdnServer(),
Instance.Graphics.CustomVSyncInterval,
Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null);
#endif
Multiplayer.GetLdnServer(),
Graphics.CustomVSyncInterval,
Hacks.ShowDirtyHacks ? Hacks.EnabledHacks : null);
} }
} }