[xlcore][feature] Dxvk settings rework #1205
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| using System; | ||
| using System.IO; | ||
| using System.Collections.Generic; | ||
| using System.Text.RegularExpressions; | ||
|
|
||
| namespace XIVLauncher.Common.Unix.Compatibility; | ||
|
|
||
| public class DxvkSettings | ||
| { | ||
| public string DownloadURL { get; private set; } | ||
|
|
||
| public string FolderName { get; private set; } | ||
|
|
||
| public Dictionary<string, string> DxvkVars { get; private set; } | ||
|
|
||
| public Dxvk.DxvkHudType DxvkHud { get; private set; } | ||
|
|
||
| public Dxvk.DxvkVersion DxvkVersion { get; private set; } | ||
|
|
||
| private const string ALLOWED_CHARS = "^[0-9a-zA-Z,=.]+$"; | ||
| private const string ALLOWED_WORDS = "^(?:devinfo|fps|frametimes|submissions|drawcalls|pipelines|descriptors|memory|gpuload|version|api|cs|compiler|samplers|scale=(?:[0-9]){0,2}(?:.(?:[0-9])+)?)$"; | ||
|
There was a problem hiding this comment. Is there a reason for scale being < 100 ? There was a problem hiding this comment. I didn't know if there were any limits, it just seemed a reasonable high number. Scales over 10 are probably not useful unless you're on an 8K+ display, but it's easy enough to change {0,2} to *. So... changed. |
||
|
|
||
| public DxvkSettings(Dxvk.DxvkHudType hud = Dxvk.DxvkHudType.None, string dxvkHudCustom="", | ||
| string mangoHudPath="", bool? async = true, int? frameRate = 0, | ||
| Dxvk.DxvkVersion version = Dxvk.DxvkVersion.v1_10_1) | ||
| { | ||
| this.DxvkHud = hud; | ||
| this.DxvkVars = new Dictionary<string, string> (); | ||
| this.DxvkVars.Add("DXVK_ASYNC", ((async ?? false) ? "1" : "0")); | ||
| frameRate ??= 0; | ||
| if (frameRate > 0) this.DxvkVars.Add("DXVK_FRAME_RATE", (frameRate).ToString()); | ||
| this.DxvkVersion = version; | ||
| string release = this.DxvkVersion switch | ||
| { | ||
| Dxvk.DxvkVersion.v1_10_1 => "1.10.1", | ||
| Dxvk.DxvkVersion.v1_10_2 => "1.10.2", | ||
| Dxvk.DxvkVersion.v1_10_3 => "1.10.3", | ||
| Dxvk.DxvkVersion.v2_0 => "2.0", | ||
| _ => VersionOutOfRange(), | ||
|
There was a problem hiding this comment. This probably should be an There was a problem hiding this comment. Alright, found a couple of examples in the code and mimicked them. It compiles, and, as you said, this shouldn't ever actually happen to a normal user. Changed. |
||
| }; | ||
| this.DownloadURL = $"https://github.com/Sporif/dxvk-async/releases/download/{release}/dxvk-async-{release}.tar.gz"; | ||
| this.FolderName = $"dxvk-async-{release}"; | ||
|
|
||
| switch(this.DxvkHud) | ||
| { | ||
| case Dxvk.DxvkHudType.Fps: | ||
| DxvkVars.Add("DXVK_HUD","fps"); | ||
| DxvkVars.Add("MANGOHUD","0"); | ||
| break; | ||
| case Dxvk.DxvkHudType.Custom: | ||
| if (!CheckDxvkHudString(dxvkHudCustom)) dxvkHudCustom = "fps,frametimes,gpuload,version"; | ||
| DxvkVars.Add("DXVK_HUD",dxvkHudCustom); | ||
| DxvkVars.Add("MANGOHUD","0"); | ||
| break; | ||
| case Dxvk.DxvkHudType.Full: | ||
| DxvkVars.Add("DXVK_HUD","full"); | ||
| DxvkVars.Add("MANGOHUD","0"); | ||
| break; | ||
| case Dxvk.DxvkHudType.MangoHud: | ||
| DxvkVars.Add("DXVK_HUD","0"); | ||
| DxvkVars.Add("MANGOHUD","1"); | ||
| DxvkVars.Add("MANGOHUD_CONFIG", ""); | ||
| break; | ||
| case Dxvk.DxvkHudType.MangoHudCustom: | ||
| DxvkVars.Add("DXVK_HUD","0"); | ||
| DxvkVars.Add("MANGOHUD","1"); | ||
| if (mangoHudPath == "") | ||
| { | ||
| string home = Environment.GetEnvironmentVariable("HOME"); | ||
| string conf1 = Path.Combine(home,".xlcore","MangoHud.conf"); | ||
| string conf2 = Path.Combine(home,".config","MangoHud","wine-ffxiv_dx11.conf"); | ||
| string conf3 = Path.Combine(home,".config","MangoHud","MangoHud.conf"); | ||
| if (CheckMangoHudPath(conf1)) | ||
| mangoHudPath = conf1; | ||
| else if (CheckMangoHudPath(conf2)) | ||
| mangoHudPath = conf2; | ||
| else if (CheckMangoHudPath(conf3)) | ||
| mangoHudPath = conf3; | ||
| } | ||
| if (CheckMangoHudPath(mangoHudPath)) | ||
| DxvkVars.Add("MANGOHUD_CONFIGFILE",mangoHudPath); | ||
| else | ||
| DxvkVars.Add("MANGOHUD_CONFIG",""); | ||
| break; | ||
| case Dxvk.DxvkHudType.MangoHudFull: | ||
| DxvkVars.Add("DXVK_HUD","0"); | ||
| DxvkVars.Add("MANGOHUD","1"); | ||
| DxvkVars.Add("MANGOHUD_CONFIG","full"); | ||
| break; | ||
| // If DxvkHudType is None, or undefined, don't set anything. | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| private string VersionOutOfRange() { | ||
|
There was a problem hiding this comment. This is unneeded with the above change |
||
| this.DxvkVersion = Dxvk.DxvkVersion.v1_10_1; | ||
| return "1.10.1"; | ||
| } | ||
|
|
||
| public static bool CheckDxvkHudString(string customHud) | ||
| { | ||
| if (customHud == "1") return true; | ||
| if (string.IsNullOrWhiteSpace(customHud)) return false; | ||
| if (!Regex.IsMatch(customHud,ALLOWED_CHARS)) return false; | ||
| string[] hudvars = customHud.Split(","); | ||
| foreach (var hudvar in hudvars) | ||
| { | ||
| if (!Regex.IsMatch(hudvar,ALLOWED_WORDS)) | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| public static bool CheckMangoHudPath(string mangoPath) | ||
| { | ||
| return (File.Exists(mangoPath)) ? true : false; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems to be duplicate code from line 80...
Actually there is no reason to do this at all since wine will create it's prefix folder on first startup anyways
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So it is... deleting that. You know how it goes with copy/paste