Further de-duplicate NVAPI interface code + GTK

src/Ryujinx.Common/GraphicsDriver/DriverUtilities.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Common.GraphicsDriver.NVAPI;
 using Ryujinx.Common.Logging;
 using System;
 
@@ -5,30 +6,21 @@ namespace Ryujinx.Common.GraphicsDriver
 {
     public static class DriverUtilities
     {
-        public static void ToggleOGLThreading(bool enabled)
+        public static void ToggleNvDriverSetting(NvapiSettingId id, bool enabled)
         {
-            Environment.SetEnvironmentVariable("mesa_glthread", enabled.ToString().ToLower());
+            try 
-            Environment.SetEnvironmentVariable("__GL_THREADED_OPTIMIZATIONS", enabled ? "1" : "0");
-
-            try
             {
-                NVDriverHelper.SetThreadedOptimization(enabled);
+                if (id == NvapiSettingId.OglThreadControlId)
+                {
+                    Environment.SetEnvironmentVariable("mesa_glthread", enabled.ToString().ToLower());
+                    Environment.SetEnvironmentVariable("__GL_THREADED_OPTIMIZATIONS", enabled ? "1" : "0");
+                }
+
+                NVDriverHelper.SetControlOption(id, enabled);
             }
             catch
             {
-                Logger.Warning?.Print(LogClass.Application, "Failed to set threaded optimizations. NVAPI may be unavailable.");
+                Logger.Warning?.Print(LogClass.Application, "Failed to set NVIDIA driver settings. NVAPI may be unavailable.");
-            }
-        }
-
-        public static void ToggleDxgiSwapchain(bool enabled)
-        {
-            try
-            {
-                NVDriverHelper.SetDxgiSwapchain(enabled);
-            }
-            catch
-            {
-                Logger.Warning?.Print(LogClass.Application, "Failed to set Vulkan/OpenGL present method. NVAPI may be unavailable.");
             }
         }
     }

src/Ryujinx.Common/GraphicsDriver/NVAPI/Nvapi.cs

@@ -1,6 +1,6 @@
 namespace Ryujinx.Common.GraphicsDriver.NVAPI
 {
-    enum NvapiSettingId : uint
+    public enum NvapiSettingId : uint
     {
         OglThreadControlId = 0x20C1221E,
         OglCplPreferDxPresentId = 0x20D690F8,

src/Ryujinx.Common/GraphicsDriver/NVDriverHelper.cs

@@ -128,44 +128,23 @@ namespace Ryujinx.Common.GraphicsDriver
             return (uint)Unsafe.SizeOf<T>() | version << 16;
         }
 
-        public static void SetThreadedOptimization(bool enabled)
+        public static void SetControlOption(NvapiSettingId id, bool enabled)
         {
             Initialize();
 
             SetupNvProfile();
 
-            uint targetValue = (uint)(enabled ? OglThreadControl.OglThreadControlEnable : OglThreadControl.OglThreadControlDisable);
+            uint targetValue = id switch
-
-            NvdrsSetting setting = new()
             {
-                Version = MakeVersion<NvdrsSetting>(1),
+                NvapiSettingId.OglThreadControlId => (uint)(enabled ? OglThreadControl.OglThreadControlEnable : OglThreadControl.OglThreadControlDisable),
-                SettingId = NvapiSettingId.OglThreadControlId,
+                NvapiSettingId.OglCplPreferDxPresentId => (uint)(enabled ? OglCplDxPresent.OglCplPreferDxPresentEnable : OglCplDxPresent.OglCplPreferDxPresentDisable),
-                SettingType = NvdrsSettingType.NvdrsDwordType,
+                _ => throw new ArgumentException(),
-                SettingLocation = NvdrsSettingLocation.NvdrsCurrentProfileLocation,
-                IsCurrentPredefined = 0,
-                IsPredefinedValid = 0,
-                CurrentValue = targetValue,
-                PredefinedValue = targetValue,
             };
 
-            Check(NvAPI_DRS_SetSetting(_handle, _profileHandle, ref setting));
-            Check(NvAPI_DRS_SaveSettings(_handle));
-
-            NvAPI_DRS_DestroySession(_handle);
-        }
-
-        public static void SetDxgiSwapchain(bool enabled)
-        {
-            Initialize();
-
-            SetupNvProfile();
-
-            uint targetValue = (uint)(enabled ? OglCplDxPresent.OglCplPreferDxPresentEnable : OglCplDxPresent.OglCplPreferDxPresentDisable);
-
             NvdrsSetting setting = new()
             {
                 Version = MakeVersion<NvdrsSetting>(1),
-                SettingId = NvapiSettingId.OglCplPreferDxPresentId,
+                SettingId = id,
                 SettingType = NvdrsSettingType.NvdrsDwordType,
                 SettingLocation = NvdrsSettingLocation.NvdrsCurrentProfileLocation,
                 IsCurrentPredefined = 0,

src/Ryujinx.Gtk3/Program.cs

@@ -2,6 +2,7 @@ using Gtk;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
+using Ryujinx.Common.GraphicsDriver.NVAPI;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
 using Ryujinx.Modules;
@@ -235,7 +236,10 @@ namespace Ryujinx
 
             // Enable OGL multithreading on the driver, when available.
             BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
-            DriverUtilities.ToggleOGLThreading(threadingMode == BackendThreading.Off);
+            DriverUtilities.ToggleNvDriverSetting(NvapiSettingId.OglThreadControlId, threadingMode == BackendThreading.Off);
+
+            // Enable DXGI present mode on the driver, when available.
+            DriverUtilities.ToggleNvDriverSetting(NvapiSettingId.OglCplPreferDxPresentId, true);
 
             // Initialize Gtk.
             Application.Init();

src/Ryujinx.Gtk3/UI/Windows/SettingsWindow.cs

@@ -7,6 +7,7 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
+using Ryujinx.Common.GraphicsDriver.NVAPI;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.Services.Time.TimeZone;
 using Ryujinx.UI.Common.Configuration;
@@ -610,7 +611,7 @@ namespace Ryujinx.UI.Windows
             BackendThreading backendThreading = Enum.Parse<BackendThreading>(_galThreading.ActiveId);
             if (ConfigurationState.Instance.Graphics.BackendThreading != backendThreading)
             {
-                DriverUtilities.ToggleOGLThreading(backendThreading == BackendThreading.Off);
+                DriverUtilities.ToggleNvDriverSetting(NvapiSettingId.OglThreadControlId, backendThreading == BackendThreading.Off);
             }
 
             ConfigurationState.Instance.Logger.EnableError.Value = _errorLogToggle.Active;

src/Ryujinx/Program.cs

@@ -5,6 +5,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
+using Ryujinx.Common.GraphicsDriver.NVAPI;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
 using Ryujinx.Modules;
@@ -112,10 +113,10 @@ namespace Ryujinx.Ava
             PrintSystemInfo();
 
             // Enable OGL multithreading on the driver, when available.
-            DriverUtilities.ToggleOGLThreading(ConfigurationState.Instance.Graphics.BackendThreading == BackendThreading.Off);
+            DriverUtilities.ToggleNvDriverSetting(NvapiSettingId.OglThreadControlId, ConfigurationState.Instance.Graphics.BackendThreading == BackendThreading.Off);
 
             // Enable Dxgi present on the driver, when available.
-            DriverUtilities.ToggleDxgiSwapchain(true);
+            DriverUtilities.ToggleNvDriverSetting(NvapiSettingId.OglCplPreferDxPresentId, true);
 
             // Check if keys exists.
             if (!File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys")))

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -12,6 +12,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
+using Ryujinx.Common.GraphicsDriver.NVAPI;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE.FileSystem;
@@ -529,7 +530,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             if (ConfigurationState.Instance.Graphics.BackendThreading != (BackendThreading)GraphicsBackendMultithreadingIndex)
             {
-                DriverUtilities.ToggleOGLThreading(GraphicsBackendMultithreadingIndex == (int)BackendThreading.Off);
+                DriverUtilities.ToggleNvDriverSetting(NvapiSettingId.OglThreadControlId, GraphicsBackendMultithreadingIndex == (int)BackendThreading.Off);
             }
 
             config.Graphics.BackendThreading.Value = (BackendThreading)GraphicsBackendMultithreadingIndex;