From 0544f137d000f285e483a216e4e08a246a4a5861 Mon Sep 17 00:00:00 2001 From: pizzaboxer Date: Tue, 27 Aug 2024 11:37:59 +0100 Subject: [PATCH] Remove preset registration for Vulkan/OpenGL --- Bloxstrap/Enums/FlagPresets/RenderingMode.cs | 2 -- Bloxstrap/FastFlagManager.cs | 15 --------------- .../UI/ViewModels/Settings/FastFlagsViewModel.cs | 6 +----- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Bloxstrap/Enums/FlagPresets/RenderingMode.cs b/Bloxstrap/Enums/FlagPresets/RenderingMode.cs index 769a430..082d301 100644 --- a/Bloxstrap/Enums/FlagPresets/RenderingMode.cs +++ b/Bloxstrap/Enums/FlagPresets/RenderingMode.cs @@ -4,9 +4,7 @@ { [EnumName(FromTranslation = "Common.Automatic")] Default, - // Vulkan, D3D11, D3D10, - // OpenGL } } diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs index 492bb68..d702c22 100644 --- a/Bloxstrap/FastFlagManager.cs +++ b/Bloxstrap/FastFlagManager.cs @@ -28,9 +28,6 @@ namespace Bloxstrap { "Rendering.Mode.D3D11", "FFlagDebugGraphicsPreferD3D11" }, { "Rendering.Mode.D3D10", "FFlagDebugGraphicsPreferD3D11FL10" }, - { "Rendering.Mode.Vulkan", "FFlagDebugGraphicsPreferVulkan" }, - { "Rendering.Mode.Vulkan.Fix", "FFlagRenderVulkanFixMinimizeWindow" }, - { "Rendering.Mode.OpenGL", "FFlagDebugGraphicsPreferOpenGL" }, { "Rendering.Lighting.Voxel", "DFFlagDebugRenderForceTechnologyVoxel" }, { "Rendering.Lighting.ShadowMap", "FFlagDebugForceFutureIsBrightPhase2" }, @@ -63,10 +60,8 @@ namespace Bloxstrap public static IReadOnlyDictionary RenderingModes => new Dictionary { { RenderingMode.Default, "None" }, - // { RenderingMode.Vulkan, "Vulkan" }, { RenderingMode.D3D11, "D3D11" }, { RenderingMode.D3D10, "D3D10" }, - // { RenderingMode.OpenGL, "OpenGL" } }; public static IReadOnlyDictionary LightingModes => new Dictionary @@ -228,14 +223,6 @@ namespace Bloxstrap 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() { // convert all flag values to strings before saving @@ -250,8 +237,6 @@ namespace Bloxstrap { base.Load(); - CheckManualFullscreenPreset(); - // TODO - remove when activity tracking has been revamped if (GetPreset("Network.Log") != "7") SetPreset("Network.Log", "7"); diff --git a/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs index d9902b7..9d0a35e 100644 --- a/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs @@ -87,11 +87,7 @@ namespace Bloxstrap.UI.ViewModels.Settings public RenderingMode SelectedRenderingMode { get => App.FastFlags.GetPresetEnum(RenderingModes, "Rendering.Mode", "True"); - set - { - App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True"); - App.FastFlags.CheckManualFullscreenPreset(); - } + set => App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True"); } public bool FixDisplayScaling