From 0c03f5bad79feb13087a54cb5c798d2a763bd230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 24 Nov 2022 19:06:07 +0100 Subject: [PATCH] Move the screen scaling filter to the DisplayLayoutEditor --- UI/DisplayLayoutScreen.cpp | 3 +++ UI/GameSettingsScreen.cpp | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 57a1d28896..38a539b2af 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -270,6 +270,9 @@ void DisplayLayoutScreen::CreateViews() { }); rightColumn->Add(rotation); + static const char *bufFilters[] = { "Linear", "Nearest", }; + rightColumn->Add(new PopupMultiChoice(&g_Config.iBufFilter, gr->T("Screen Scaling Filter"), bufFilters, 1, ARRAY_SIZE(bufFilters), gr->GetName(), screenManager())); + rightColumn->Add(new ItemHeader(gr->T("Postprocessing effect"))); Draw::DrawContext *draw = screenManager()->getDrawContext(); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index ef7d5b6c3a..afaaaeaff3 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -569,9 +569,6 @@ void GameSettingsScreen::CreateViews() { static const char *texFilters[] = { "Auto", "Nearest", "Linear", "Auto Max Quality"}; graphicsSettings->Add(new PopupMultiChoice(&g_Config.iTexFiltering, gr->T("Texture Filter"), texFilters, 1, ARRAY_SIZE(texFilters), gr->GetName(), screenManager())); - static const char *bufFilters[] = { "Linear", "Nearest", }; - graphicsSettings->Add(new PopupMultiChoice(&g_Config.iBufFilter, gr->T("Screen Scaling Filter"), bufFilters, 1, ARRAY_SIZE(bufFilters), gr->GetName(), screenManager())); - #if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) bool showCardboardSettings = deviceType != DEVICE_TYPE_VR; #else