Remove preset registration for Vulkan/OpenGL

This commit is contained in:
pizzaboxer 2024-08-27 11:37:59 +01:00
parent 91e2c45f0c
commit 0544f137d0
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
3 changed files with 1 additions and 22 deletions

View File

@ -4,9 +4,7 @@
{ {
[EnumName(FromTranslation = "Common.Automatic")] [EnumName(FromTranslation = "Common.Automatic")]
Default, Default,
// Vulkan,
D3D11, D3D11,
D3D10, D3D10,
// OpenGL
} }
} }

View File

@ -28,9 +28,6 @@ namespace Bloxstrap
{ "Rendering.Mode.D3D11", "FFlagDebugGraphicsPreferD3D11" }, { "Rendering.Mode.D3D11", "FFlagDebugGraphicsPreferD3D11" },
{ "Rendering.Mode.D3D10", "FFlagDebugGraphicsPreferD3D11FL10" }, { "Rendering.Mode.D3D10", "FFlagDebugGraphicsPreferD3D11FL10" },
{ "Rendering.Mode.Vulkan", "FFlagDebugGraphicsPreferVulkan" },
{ "Rendering.Mode.Vulkan.Fix", "FFlagRenderVulkanFixMinimizeWindow" },
{ "Rendering.Mode.OpenGL", "FFlagDebugGraphicsPreferOpenGL" },
{ "Rendering.Lighting.Voxel", "DFFlagDebugRenderForceTechnologyVoxel" }, { "Rendering.Lighting.Voxel", "DFFlagDebugRenderForceTechnologyVoxel" },
{ "Rendering.Lighting.ShadowMap", "FFlagDebugForceFutureIsBrightPhase2" }, { "Rendering.Lighting.ShadowMap", "FFlagDebugForceFutureIsBrightPhase2" },
@ -63,10 +60,8 @@ namespace Bloxstrap
public static IReadOnlyDictionary<RenderingMode, string> RenderingModes => new Dictionary<RenderingMode, string> public static IReadOnlyDictionary<RenderingMode, string> RenderingModes => new Dictionary<RenderingMode, string>
{ {
{ RenderingMode.Default, "None" }, { RenderingMode.Default, "None" },
// { RenderingMode.Vulkan, "Vulkan" },
{ RenderingMode.D3D11, "D3D11" }, { RenderingMode.D3D11, "D3D11" },
{ RenderingMode.D3D10, "D3D10" }, { RenderingMode.D3D10, "D3D10" },
// { RenderingMode.OpenGL, "OpenGL" }
}; };
public static IReadOnlyDictionary<LightingMode, string> LightingModes => new Dictionary<LightingMode, string> public static IReadOnlyDictionary<LightingMode, string> LightingModes => new Dictionary<LightingMode, string>
@ -228,14 +223,6 @@ namespace Bloxstrap
return mapping.First().Key; return mapping.First().Key;
} }
public void CheckManualFullscreenPreset()
{
if (GetPreset("Rendering.Mode.Vulkan") == "True" || GetPreset("Rendering.Mode.OpenGL") == "True")
SetPreset("Rendering.ManualFullscreen", null);
else
SetPreset("Rendering.ManualFullscreen", "False");
}
public override void Save() public override void Save()
{ {
// convert all flag values to strings before saving // convert all flag values to strings before saving
@ -250,8 +237,6 @@ namespace Bloxstrap
{ {
base.Load(); base.Load();
CheckManualFullscreenPreset();
// TODO - remove when activity tracking has been revamped // TODO - remove when activity tracking has been revamped
if (GetPreset("Network.Log") != "7") if (GetPreset("Network.Log") != "7")
SetPreset("Network.Log", "7"); SetPreset("Network.Log", "7");

View File

@ -87,11 +87,7 @@ namespace Bloxstrap.UI.ViewModels.Settings
public RenderingMode SelectedRenderingMode public RenderingMode SelectedRenderingMode
{ {
get => App.FastFlags.GetPresetEnum(RenderingModes, "Rendering.Mode", "True"); get => App.FastFlags.GetPresetEnum(RenderingModes, "Rendering.Mode", "True");
set set => App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True");
{
App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True");
App.FastFlags.CheckManualFullscreenPreset();
}
} }
public bool FixDisplayScaling public bool FixDisplayScaling