diff --git a/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs index ebe26acb0..2669e8a26 100644 --- a/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs @@ -25,7 +25,6 @@ using System.Net.NetworkInformation; using System.Runtime.InteropServices; using System.Threading.Tasks; using TimeZone = Ryujinx.Ava.UI.Models.TimeZone; -using Ryujinx.Graphics.OpenGL; namespace Ryujinx.Ava.UI.ViewModels { @@ -112,7 +111,7 @@ namespace Ryujinx.Ava.UI.ViewModels OnPropertyChanged(); } } - + public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS(); public bool IsHypervisorAvailable => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64; @@ -216,9 +215,9 @@ namespace Ryujinx.Ava.UI.ViewModels OnPropertyChanged(nameof(IsOpenGLSelected)); } } - + public bool IsOpenGLSelected => !IsVulkanSelected; - + public int ScalingFilter { get => _scalingFilter; diff --git a/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs b/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs index a8bede37c..4b52e235d 100644 --- a/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs +++ b/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs @@ -57,7 +57,7 @@ namespace Ryujinx.Graphics.Gpu /// Enables or disables the shader cache. /// public static bool EnableShaderCache; - + /// /// Enables or disables Spir-V on OpenGL. /// diff --git a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs index 76a2bf218..51257adfa 100644 --- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs +++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs @@ -101,7 +101,7 @@ namespace Ryujinx.Graphics.Gpu.Shader _programsToSaveQueue = new Queue(); string diskCacheTitleId = GetDiskCachePath(); - + _computeShaderCache = new ComputeShaderCacheHashTable(); _graphicsShaderCache = new ShaderCacheHashTable(); _diskCacheHostStorage = new DiskCacheHostStorage(diskCacheTitleId); @@ -160,7 +160,7 @@ namespace Ryujinx.Graphics.Gpu.Shader { Logger.Warning?.PrintMsg(LogClass.Gpu, $"Spir-V Not Available on OpenGL for your GPU"); } - + if (_diskCacheHostStorage.CacheEnabled) { ParallelDiskCacheLoader loader = new( @@ -724,7 +724,7 @@ namespace Ryujinx.Graphics.Gpu.Shader _ => 0, }; } - + /// /// Creates shader translation options with the requested graphics API and flags. /// The shader language is choosen based on the current configuration and graphics API. diff --git a/src/Ryujinx.Ui.Common/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx.Ui.Common/Configuration/ConfigurationFileFormat.cs index aa4af958f..37a02679b 100644 --- a/src/Ryujinx.Ui.Common/Configuration/ConfigurationFileFormat.cs +++ b/src/Ryujinx.Ui.Common/Configuration/ConfigurationFileFormat.cs @@ -175,7 +175,7 @@ namespace Ryujinx.Ui.Common.Configuration /// Enables or disables Shader cache /// public bool EnableShaderCache { get; set; } - + /// /// Enables or disables Spir-V Shaders on OpenGL /// diff --git a/src/Ryujinx.Ui.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.Ui.Common/Configuration/ConfigurationState.cs index cd4edde4d..8440eca3e 100644 --- a/src/Ryujinx.Ui.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.Ui.Common/Configuration/ConfigurationState.cs @@ -474,7 +474,7 @@ namespace Ryujinx.Ui.Common.Configuration /// Enables or disables Shader cache /// public ReactiveObject EnableShaderCache { get; private set; } - + /// /// Enables or disables Spir-V Shaders on OpenGL /// @@ -1417,7 +1417,7 @@ namespace Ryujinx.Ui.Common.Configuration configurationFileUpdated = true; } - + if (configurationFileFormat.Version < 49) { Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 48."); diff --git a/src/Ryujinx/Ui/Windows/SettingsWindow.cs b/src/Ryujinx/Ui/Windows/SettingsWindow.cs index 5d2503a77..f269d4125 100644 --- a/src/Ryujinx/Ui/Windows/SettingsWindow.cs +++ b/src/Ryujinx/Ui/Windows/SettingsWindow.cs @@ -250,7 +250,7 @@ namespace Ryujinx.Ui.Windows { _shaderCacheToggle.Click(); } - + if (ConfigurationState.Instance.Graphics.EnableOGLSpirV) { _enableOGLSpirV.Click();