mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-10 09:48:51 +02:00
Changes ordering of config.json and configuration files (#2253)
This allows configuration values to be written to log file for analysis
This commit is contained in:
parent
8a81be9eca
commit
1998a3a90a
3 changed files with 9 additions and 8 deletions
|
@ -18,6 +18,11 @@ namespace Ryujinx.Configuration
|
||||||
|
|
||||||
public int Version { get; set; }
|
public int Version { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Enables or disables logging to a file on disk
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableFileLog { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Resolution Scale. An integer scale applied to applicable render targets. Values 1-4, or -1 to use a custom floating point scale instead.
|
/// Resolution Scale. An integer scale applied to applicable render targets. Values 1-4, or -1 to use a custom floating point scale instead.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -88,10 +93,6 @@ namespace Ryujinx.Configuration
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public GraphicsDebugLevel LoggingGraphicsDebugLevel { get; set; }
|
public GraphicsDebugLevel LoggingGraphicsDebugLevel { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Enables or disables logging to a file on disk
|
|
||||||
/// </summary>
|
|
||||||
public bool EnableFileLog { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Change System Language
|
/// Change System Language
|
||||||
|
|
|
@ -408,6 +408,7 @@ namespace Ryujinx.Configuration
|
||||||
ConfigurationFileFormat configurationFile = new ConfigurationFileFormat
|
ConfigurationFileFormat configurationFile = new ConfigurationFileFormat
|
||||||
{
|
{
|
||||||
Version = ConfigurationFileFormat.CurrentVersion,
|
Version = ConfigurationFileFormat.CurrentVersion,
|
||||||
|
EnableFileLog = Logger.EnableFileLog,
|
||||||
ResScale = Graphics.ResScale,
|
ResScale = Graphics.ResScale,
|
||||||
ResScaleCustom = Graphics.ResScaleCustom,
|
ResScaleCustom = Graphics.ResScaleCustom,
|
||||||
MaxAnisotropy = Graphics.MaxAnisotropy,
|
MaxAnisotropy = Graphics.MaxAnisotropy,
|
||||||
|
@ -422,7 +423,6 @@ namespace Ryujinx.Configuration
|
||||||
LoggingEnableFsAccessLog = Logger.EnableFsAccessLog,
|
LoggingEnableFsAccessLog = Logger.EnableFsAccessLog,
|
||||||
LoggingFilteredClasses = Logger.FilteredClasses,
|
LoggingFilteredClasses = Logger.FilteredClasses,
|
||||||
LoggingGraphicsDebugLevel = Logger.GraphicsDebugLevel,
|
LoggingGraphicsDebugLevel = Logger.GraphicsDebugLevel,
|
||||||
EnableFileLog = Logger.EnableFileLog,
|
|
||||||
SystemLanguage = System.Language,
|
SystemLanguage = System.Language,
|
||||||
SystemRegion = System.Region,
|
SystemRegion = System.Region,
|
||||||
SystemTimeZone = System.TimeZone,
|
SystemTimeZone = System.TimeZone,
|
||||||
|
@ -474,6 +474,7 @@ namespace Ryujinx.Configuration
|
||||||
|
|
||||||
public void LoadDefault()
|
public void LoadDefault()
|
||||||
{
|
{
|
||||||
|
Logger.EnableFileLog.Value = true;
|
||||||
Graphics.ResScale.Value = 1;
|
Graphics.ResScale.Value = 1;
|
||||||
Graphics.ResScaleCustom.Value = 1.0f;
|
Graphics.ResScaleCustom.Value = 1.0f;
|
||||||
Graphics.MaxAnisotropy.Value = -1.0f;
|
Graphics.MaxAnisotropy.Value = -1.0f;
|
||||||
|
@ -488,7 +489,6 @@ namespace Ryujinx.Configuration
|
||||||
Logger.EnableFsAccessLog.Value = false;
|
Logger.EnableFsAccessLog.Value = false;
|
||||||
Logger.FilteredClasses.Value = Array.Empty<LogClass>();
|
Logger.FilteredClasses.Value = Array.Empty<LogClass>();
|
||||||
Logger.GraphicsDebugLevel.Value = GraphicsDebugLevel.None;
|
Logger.GraphicsDebugLevel.Value = GraphicsDebugLevel.None;
|
||||||
Logger.EnableFileLog.Value = true;
|
|
||||||
System.Language.Value = Language.AmericanEnglish;
|
System.Language.Value = Language.AmericanEnglish;
|
||||||
System.Region.Value = Region.USA;
|
System.Region.Value = Region.USA;
|
||||||
System.TimeZone.Value = "UTC";
|
System.TimeZone.Value = "UTC";
|
||||||
|
@ -803,6 +803,7 @@ namespace Ryujinx.Configuration
|
||||||
configurationFileUpdated = true;
|
configurationFileUpdated = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog;
|
||||||
Graphics.ResScale.Value = configurationFileFormat.ResScale;
|
Graphics.ResScale.Value = configurationFileFormat.ResScale;
|
||||||
Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom;
|
Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom;
|
||||||
Graphics.MaxAnisotropy.Value = configurationFileFormat.MaxAnisotropy;
|
Graphics.MaxAnisotropy.Value = configurationFileFormat.MaxAnisotropy;
|
||||||
|
@ -817,7 +818,6 @@ namespace Ryujinx.Configuration
|
||||||
Logger.EnableFsAccessLog.Value = configurationFileFormat.LoggingEnableFsAccessLog;
|
Logger.EnableFsAccessLog.Value = configurationFileFormat.LoggingEnableFsAccessLog;
|
||||||
Logger.FilteredClasses.Value = configurationFileFormat.LoggingFilteredClasses;
|
Logger.FilteredClasses.Value = configurationFileFormat.LoggingFilteredClasses;
|
||||||
Logger.GraphicsDebugLevel.Value = configurationFileFormat.LoggingGraphicsDebugLevel;
|
Logger.GraphicsDebugLevel.Value = configurationFileFormat.LoggingGraphicsDebugLevel;
|
||||||
Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog;
|
|
||||||
System.Language.Value = configurationFileFormat.SystemLanguage;
|
System.Language.Value = configurationFileFormat.SystemLanguage;
|
||||||
System.Region.Value = configurationFileFormat.SystemRegion;
|
System.Region.Value = configurationFileFormat.SystemRegion;
|
||||||
System.TimeZone.Value = configurationFileFormat.SystemTimeZone;
|
System.TimeZone.Value = configurationFileFormat.SystemTimeZone;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
"version": 24,
|
"version": 24,
|
||||||
|
"enable_file_log": true,
|
||||||
"res_scale": 1,
|
"res_scale": 1,
|
||||||
"res_scale_custom": 1,
|
"res_scale_custom": 1,
|
||||||
"max_anisotropy": -1,
|
"max_anisotropy": -1,
|
||||||
|
@ -14,7 +15,6 @@
|
||||||
"logging_enable_fs_access_log": false,
|
"logging_enable_fs_access_log": false,
|
||||||
"logging_filtered_classes": [],
|
"logging_filtered_classes": [],
|
||||||
"logging_graphics_debug_level": "None",
|
"logging_graphics_debug_level": "None",
|
||||||
"enable_file_log": true,
|
|
||||||
"system_language": "AmericanEnglish",
|
"system_language": "AmericanEnglish",
|
||||||
"system_region": "USA",
|
"system_region": "USA",
|
||||||
"system_time_zone": "UTC",
|
"system_time_zone": "UTC",
|
||||||
|
|
Loading…
Reference in a new issue