diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2020-07-07 03:41:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 04:41:07 +0200 |
| commit | 484eb645ae0611f60fae845ed011ed6115352e06 (patch) | |
| tree | b15972f04dae0b1b6c644cbbbdfcd98856adee15 /Ryujinx.Common/Configuration/ConfigurationState.cs | |
| parent | 43b78ae157eed5c9436dc19a6d498655891202d8 (diff) | |
Implement Zero-Configuration Resolution Scaling (#1365)
* Initial implementation of Render Target Scaling
Works with most games I have. No GUI option right now, it is hardcoded.
Missing handling for texelFetch operation.
* Realtime Configuration, refactoring.
* texelFetch scaling on fragment shader (WIP)
* Improve Shader-Side changes.
* Fix potential crash when no color/depth bound
* Workaround random uses of textures in compute.
This was blacklisting textures in a few games despite causing no bugs. Will eventually add full support so this doesn't break anything.
* Fix scales oscillating when changing between non-native scales.
* Scaled textures on compute, cleanup, lazier uniform update.
* Cleanup.
* Fix stupidity
* Address Thog Feedback.
* Cover most of GDK's feedback (two comments remain)
* Fix bad rename
* Move IsDepthStencil to FormatExtensions, add docs.
* Fix default config, square texture detection.
* Three final fixes:
- Nearest copy when texture is integer format.
- Texture2D -> Texture3D copy correctly blacklists the texture before trying an unscaled copy (caused driver error)
- Discount small textures.
* Remove scale threshold.
Not needed right now - we'll see if we run into problems.
* All CPU modification blacklists scale.
* Fix comment.
Diffstat (limited to 'Ryujinx.Common/Configuration/ConfigurationState.cs')
| -rw-r--r-- | Ryujinx.Common/Configuration/ConfigurationState.cs | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/Ryujinx.Common/Configuration/ConfigurationState.cs b/Ryujinx.Common/Configuration/ConfigurationState.cs index 0f5367f9..3149f250 100644 --- a/Ryujinx.Common/Configuration/ConfigurationState.cs +++ b/Ryujinx.Common/Configuration/ConfigurationState.cs @@ -272,6 +272,16 @@ namespace Ryujinx.Configuration public ReactiveObject<float> MaxAnisotropy { get; private set; } /// <summary> + /// Resolution Scale. An integer scale applied to applicable render targets. Values 1-4, or -1 to use a custom floating point scale instead. + /// </summary> + public ReactiveObject<int> ResScale { get; private set; } + + /// <summary> + /// Custom Resolution Scale. A custom floating point scale applied to applicable render targets. Only active when Resolution Scale is -1. + /// </summary> + public ReactiveObject<float> ResScaleCustom { get; private set; } + + /// <summary> /// Dumps shaders in this local directory /// </summary> public ReactiveObject<string> ShadersDumpPath { get; private set; } @@ -283,6 +293,8 @@ namespace Ryujinx.Configuration public GraphicsSection() { + ResScale = new ReactiveObject<int>(); + ResScaleCustom = new ReactiveObject<float>(); MaxAnisotropy = new ReactiveObject<float>(); ShadersDumpPath = new ReactiveObject<string>(); EnableVsync = new ReactiveObject<bool>(); @@ -354,6 +366,8 @@ namespace Ryujinx.Configuration ConfigurationFileFormat configurationFile = new ConfigurationFileFormat { Version = ConfigurationFileFormat.CurrentVersion, + ResScale = Graphics.ResScale, + ResScaleCustom = Graphics.ResScaleCustom, MaxAnisotropy = Graphics.MaxAnisotropy, GraphicsShadersDumpPath = Graphics.ShadersDumpPath, LoggingEnableDebug = Logger.EnableDebug, @@ -410,6 +424,8 @@ namespace Ryujinx.Configuration public void LoadDefault() { + Graphics.ResScale.Value = 1; + Graphics.ResScaleCustom.Value = 1.0f; Graphics.MaxAnisotropy.Value = -1; Graphics.ShadersDumpPath.Value = ""; Logger.EnableDebug.Value = false; @@ -652,10 +668,22 @@ namespace Ryujinx.Configuration configurationFileUpdated = true; } + if (configurationFileFormat.Version < 11) + { + Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 11."); + + configurationFileFormat.ResScale = 1; + configurationFileFormat.ResScaleCustom = 1.0f; + + configurationFileUpdated = true; + } + List<InputConfig> inputConfig = new List<InputConfig>(); inputConfig.AddRange(configurationFileFormat.ControllerConfig); inputConfig.AddRange(configurationFileFormat.KeyboardConfig); + Graphics.ResScale.Value = configurationFileFormat.ResScale; + Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom; Graphics.MaxAnisotropy.Value = configurationFileFormat.MaxAnisotropy; Graphics.ShadersDumpPath.Value = configurationFileFormat.GraphicsShadersDumpPath; Logger.EnableDebug.Value = configurationFileFormat.LoggingEnableDebug; |
