From df54dcb9e147abf25e31e844f9b2d093709a8ff7 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Fri, 3 Nov 2023 09:03:55 +0000
Subject: [PATCH] Remove options for rendering mode selection

---
 Bloxstrap/FastFlagManager.cs                  | 27 ++-----------------
 Bloxstrap/InstallChecker.cs                   | 10 +++++++
 .../UI/Elements/Menu/Pages/FastFlagsPage.xaml |  9 -------
 .../UI/ViewModels/Menu/FastFlagsViewModel.cs  | 12 ---------
 4 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs
index eb66599..26599fd 100644
--- a/Bloxstrap/FastFlagManager.cs
+++ b/Bloxstrap/FastFlagManager.cs
@@ -28,12 +28,6 @@ namespace Bloxstrap
             { "Rendering.TexturePack", "FStringPartTexturePackTable2022" },
             { "Rendering.DisableScaling", "DFFlagDisableDPIScale" },
 
-            { "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" },
             { "Rendering.Lighting.Future", "FFlagDebugForceFutureIsBrightPhase3" },
@@ -53,16 +47,6 @@ namespace Bloxstrap
             { "UI.Menu.Style.ABTest.4", "FFlagEnableV3MenuABTest3" }
         };
 
-        // only one missing here is Metal because lol
-        public static IReadOnlyDictionary<string, string> RenderingModes => new Dictionary<string, string>
-        {
-            { "Automatic", "None" },
-            { "Vulkan", "Vulkan" },
-            { "Direct3D 11", "D3D11" },
-            { "Direct3D 10", "D3D10" },
-            { "OpenGL", "OpenGL" }
-        };
-
         public static IReadOnlyDictionary<string, string> LightingModes => new Dictionary<string, string>
         {
             { "Chosen by game", "None" },
@@ -199,14 +183,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
@@ -221,7 +197,8 @@ namespace Bloxstrap
         {
             base.Load();
 
-            CheckManualFullscreenPreset();
+            if (GetPreset("Rendering.ManualFullscreen") != "False")
+                SetPreset("Rendering.ManualFullscreen", "False");
 
             // TODO - remove when activity tracking has been revamped
             if (GetPreset("Network.Log") != "7")
diff --git a/Bloxstrap/InstallChecker.cs b/Bloxstrap/InstallChecker.cs
index 7e4bb09..3744e84 100644
--- a/Bloxstrap/InstallChecker.cs
+++ b/Bloxstrap/InstallChecker.cs
@@ -227,6 +227,16 @@ namespace Bloxstrap
                     if (App.FastFlags.GetPreset("UI.Menu.Style.DisableV2") is not null)
                         App.FastFlags.SetPreset("UI.Menu.Style.ABTest", false);
 
+                    App.FastFlags.Save();
+                }
+                else if (existingVersionInfo.ProductVersion == "2.5.3")
+                {
+                    App.FastFlags.SetValue("FFlagDebugGraphicsPreferD3D11", null);
+                    App.FastFlags.SetValue("FFlagDebugGraphicsPreferD3D11FL10", null);
+                    App.FastFlags.SetValue("FFlagDebugGraphicsPreferVulkan", null);
+                    App.FastFlags.SetValue("FFlagRenderVulkanFixMinimizeWindow", null);
+                    App.FastFlags.SetValue("FFlagDebugGraphicsPreferOpenGL", null);
+
                     App.FastFlags.Save();
                 }
             }
diff --git a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
index 4d6fe7a..0cff685 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
+++ b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
@@ -162,15 +162,6 @@
       </ui:CardControl.Header>
       <ui:ToggleSwitch IsChecked="{Binding Pre2022TexturesEnabled, Mode=TwoWay}" />
     </ui:CardControl>
-    <ui:CardControl Margin="0,8,0,0">
-      <ui:CardControl.Header>
-        <StackPanel>
-          <TextBlock FontSize="14" Text="Rendering mode" />
-          <TextBlock Margin="0,2,0,0" FontSize="12" Text="Choose what renderer Roblox should use. VR requires Direct3D/Automatic." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-        </StackPanel>
-      </ui:CardControl.Header>
-      <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding RenderingModes.Keys, Mode=OneTime}" Text="{Binding SelectedRenderingMode, Mode=TwoWay}" />
-    </ui:CardControl>
     <ui:CardControl Margin="0,8,0,0">
       <ui:CardControl.Header>
         <StackPanel>
diff --git a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
index 8dee2e5..4c2c5cf 100644
--- a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
@@ -58,18 +58,6 @@ namespace Bloxstrap.UI.ViewModels.Menu
             set => App.FastFlags.SetPreset("Rendering.Framerate", value);
         }
 
-        public IReadOnlyDictionary<string, string> RenderingModes => FastFlagManager.RenderingModes;
-
-        public string SelectedRenderingMode
-        {
-            get => App.FastFlags.GetPresetEnum(RenderingModes, "Rendering.Mode", "True");
-            set
-            {
-                App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True");
-                App.FastFlags.CheckManualFullscreenPreset();
-            }
-        }
-
         public bool FixDisplayScaling
         {
             get => App.FastFlags.GetPreset("Rendering.DisableScaling") == "True";