From 93a32c285bc7b9969f094e07111ed1636c5a0748 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 1 Aug 2020 22:32:55 -0700 Subject: [PATCH] UI: Simplify on/off for hardware tex scaling. --- UI/GameSettingsScreen.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index d3846ba413..7c6637faef 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -489,14 +489,11 @@ void GameSettingsScreen::CreateViews() { return !g_Config.bSoftwareRendering && !UsingHardwareTextureScaling(); }); - CheckBox *texHardwareScaling = graphicsSettings->Add(new CheckBox(&g_Config.bTexHardwareScaling, gr->T("Hardware texture scaling"))); - texHardwareScaling->SetEnabledFunc([]() { - return GetGPUBackend() == GPUBackend::VULKAN && !g_Config.bSoftwareRendering; - }); - ChoiceWithValueDisplay *textureShaderChoice = graphicsSettings->Add(new ChoiceWithValueDisplay(&g_Config.sTextureShaderName, gr->T("Texture Shader"), &TextureTranslateName)); textureShaderChoice->OnClick.Handle(this, &GameSettingsScreen::OnTextureShader); - textureShaderChoice->SetEnabledFunc(UsingHardwareTextureScaling); + textureShaderChoice->SetEnabledFunc([]() { + return GetGPUBackend() == GPUBackend::VULKAN && !g_Config.bSoftwareRendering; + }); graphicsSettings->Add(new ItemHeader(gr->T("Texture Filtering"))); static const char *anisoLevels[] = { "Off", "2x", "4x", "8x", "16x" }; @@ -1501,6 +1498,7 @@ UI::EventReturn GameSettingsScreen::OnTextureShader(UI::EventParams &e) { UI::EventReturn GameSettingsScreen::OnTextureShaderChange(UI::EventParams &e) { NativeMessageReceived("gpu_resized", ""); RecreateViews(); // Update setting name + g_Config.bTexHardwareScaling = g_Config.sTextureShaderName != "Off"; return UI::EVENT_DONE; }