Merge pull request #124 from goatcorp/remove-dx9

Remove dx9
goatcorp · Mar 19, 2024 · c6cd1b2 · c6cd1b2
2 parents d0c6f3c + 4fc7c1d
commit c6cd1b2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/lib/FFXIVQuickLauncher b/lib/FFXIVQuickLauncher
diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs
@@ -168,7 +168,7 @@ public async Task<bool> Login(string username, string password, bool isOtp, bool
             else
                 gameRunner = new UnixGameRunner(Program.CompatibilityTools, null, false);
 
-            App.Launcher.LaunchGame(gameRunner, "0", 1, 2, false, "", App.Settings.GamePath!, true, ClientLanguage.Japanese, true, DpiAwareness.Unaware);
+            App.Launcher.LaunchGame(gameRunner, "0", 1, 2, false, "", App.Settings.GamePath!, ClientLanguage.Japanese, true, DpiAwareness.Unaware);
 
             return false;
         }
@@ -653,7 +653,7 @@ public async Task<Process> StartGameAndAddon(Launcher.LoginResult loginResult, b
                 */
         }
 
-        if (App.Settings.DalamudEnabled.GetValueOrDefault(true) && !forceNoDalamud && App.Settings.IsDx11.GetValueOrDefault(true))
+        if (App.Settings.DalamudEnabled.GetValueOrDefault(true) && !forceNoDalamud)
         {
             try
             {
@@ -829,7 +829,6 @@ public async Task<Process> StartGameAndAddon(Launcher.LoginResult loginResult, b
             isSteam,
             gameArgs,
             App.Settings.GamePath,
-            App.Settings.IsDx11 ?? true,
             App.Settings.ClientLanguage.GetValueOrDefault(ClientLanguage.English),
             App.Settings.IsEncryptArgs.GetValueOrDefault(true),
             App.Settings.DpiAwareness.GetValueOrDefault(DpiAwareness.Unaware));

diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs
@@ -28,11 +28,6 @@ public class SettingsTabGame : SettingsTab
             CheckVisibility = () => Environment.OSVersion.Platform == PlatformID.Unix,
         },
 
-        new SettingsEntry<bool>("Use DirectX11", "Use the modern DirectX11 version of the game.", () => Program.Config.IsDx11 ?? true, x => Program.Config.IsDx11 = x)
-        {
-            CheckWarning = x => !x ? "DirectX 9 is no longer supported by the game or Dalamud. Things may not work." : null
-        },
-
         new SettingsEntry<string>("Additional Game Arguments", "Follows Steam conventions: VAR1=value VAR2=value %command% -arg1 -arg2.\nCan't pass programs (like gamescope -- %command%). Does not accept flatpak args (--parent-pid=1, etc.)", () => Program.Config.AdditionalArgs, x => Program.Config.AdditionalArgs = x),
         new SettingsEntry<ClientLanguage>("Game Language", "Select the game's language.", () => Program.Config.ClientLanguage ?? ClientLanguage.English, x => Program.Config.ClientLanguage = x),
         new SettingsEntry<DpiAwareness>("Game DPI Awareness", "Select the game's DPI Awareness. Change this if the game's scaling looks wrong.", () => Program.Config.DpiAwareness ?? DpiAwareness.Unaware, x => Program.Config.DpiAwareness = x),

diff --git a/src/XIVLauncher.Core/Configuration/ILauncherConfig.cs b/src/XIVLauncher.Core/Configuration/ILauncherConfig.cs
@@ -38,8 +38,6 @@ public interface ILauncherConfig
 
     public List<AddonEntry>? Addons { get; set; }
 
-    public bool? IsDx11 { get; set; }
-
     public bool? IsEncryptArgs { get; set; }
 
     public bool? IsFt { get; set; }

diff --git a/src/XIVLauncher.Core/Program.cs b/src/XIVLauncher.Core/Program.cs
@@ -102,7 +102,6 @@ private static void LoadConfig(Storage storage)
         Config.DoVersionCheck ??= true;
         Config.FontPxSize ??= 22.0f;
 
-        Config.IsDx11 ??= true;
         Config.IsEncryptArgs ??= true;
         Config.IsFt ??= false;
         Config.IsOtpServer ??= false;

diff --git a/src/XIVLauncher.Core/Support/Troubleshooting.cs b/src/XIVLauncher.Core/Support/Troubleshooting.cs
@@ -29,7 +29,7 @@ public static void LogException(Exception exception, string context)
 
             try
             {
-                var fixedContext = context?.Split(new []{'\r', '\n'}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
+                var fixedContext = context?.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
 
                 var payload = new ExceptionPayload
                 {
@@ -65,7 +65,7 @@ internal static void LogTroubleshooting()
 
         internal static string GetTroubleshootingJson()
         {
-            
+
             var gamePath = Program.Config.GamePath;
 
             var integrity = TroubleshootingPayload.IndexIntegrityResult.Success;
@@ -93,7 +93,7 @@ internal static string GetTroubleshootingJson()
             {
                 integrity = TroubleshootingPayload.IndexIntegrityResult.Exception;
             }
-            
+
             var ffxivVer = Repository.Ffxiv.GetVer(gamePath);
             var ffxivVerBck = Repository.Ffxiv.GetVer(gamePath, true);
             var ex1Ver = Repository.Ex1.GetVer(gamePath);
@@ -108,7 +108,6 @@ internal static string GetTroubleshootingJson()
             var payload = new TroubleshootingPayload
             {
                 When = DateTime.Now,
-                IsDx11 = Program.Config.IsDx11.GetValueOrDefault(),
                 IsAutoLogin = Program.Config.IsAutologin.GetValueOrDefault(),
                 IsUidCache = Program.Config.IsUidCacheEnabled.GetValueOrDefault(),
                 DalamudEnabled = Program.Config.DalamudEnabled.GetValueOrDefault(),
@@ -149,8 +148,6 @@ private class TroubleshootingPayload
         {
             public DateTime When { get; set; }
 
-            public bool IsDx11 { get; set; }
-
             public bool IsAutoLogin { get; set; }
 
             public bool IsUidCache { get; set; }