Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dx9 #124

Merged
merged 5 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/XIVLauncher.Core/Components/MainPage/MainPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 0 additions & 2 deletions src/XIVLauncher.Core/Configuration/ILauncherConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
1 change: 0 additions & 1 deletion src/XIVLauncher.Core/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,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;
Expand Down
9 changes: 3 additions & 6 deletions src/XIVLauncher.Core/Support/Troubleshooting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -65,7 +65,7 @@ internal static void LogTroubleshooting()

internal static string GetTroubleshootingJson()
{

var gamePath = Program.Config.GamePath;

var integrity = TroubleshootingPayload.IndexIntegrityResult.Success;
Expand Down Expand Up @@ -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);
Expand All @@ -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(),
Expand Down Expand Up @@ -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; }
Expand Down
Loading