From f7607316ab6cb849c70058fc54a39dc7fe791379 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 5 Oct 2021 19:32:11 -0700 Subject: [PATCH] Windows: Remove UI for auto texture scaling. Functionality removed in 887f610. --- Windows/MainWindow.cpp | 4 ---- Windows/MainWindow.h | 1 - Windows/MainWindowMenu.cpp | 10 +++++----- Windows/ppsspp.rc | 1 - Windows/resource.h | 1 - 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 26c64a1c33..56d953d79b 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -233,10 +233,6 @@ namespace MainWindow g_Config.iInternalResolution = 0; } - // Taking auto-texture scaling into account - if (g_Config.iTexScalingLevel == TEXSCALING_AUTO) - setTexScalingMultiplier(0); - NativeMessageReceived("gpu_resized", ""); } diff --git a/Windows/MainWindow.h b/Windows/MainWindow.h index 618d904fcd..23ee0a2696 100644 --- a/Windows/MainWindow.h +++ b/Windows/MainWindow.h @@ -51,7 +51,6 @@ namespace MainWindow RESOLUTION_9X = 9, RESOLUTION_MAX = 10, - TEXSCALING_AUTO = 0, TEXSCALING_OFF = 1, TEXSCALING_2X = 2, TEXSCALING_3X = 3, diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index 74eeba5f44..006fed4f4a 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -763,7 +763,6 @@ namespace MainWindow { } break; - case ID_TEXTURESCALING_AUTO: setTexScalingMultiplier(TEXSCALING_AUTO); break; case ID_TEXTURESCALING_OFF: setTexScalingMultiplier(TEXSCALING_OFF); break; case ID_TEXTURESCALING_2X: setTexScalingMultiplier(TEXSCALING_2X); break; case ID_TEXTURESCALING_3X: setTexScalingMultiplier(TEXSCALING_3X); break; @@ -1181,21 +1180,22 @@ namespace MainWindow { } static const int texscalingitems[] = { - ID_TEXTURESCALING_AUTO, ID_TEXTURESCALING_OFF, ID_TEXTURESCALING_2X, ID_TEXTURESCALING_3X, ID_TEXTURESCALING_4X, ID_TEXTURESCALING_5X, }; - if (g_Config.iTexScalingLevel < TEXSCALING_AUTO) - g_Config.iTexScalingLevel = TEXSCALING_AUTO; + if (g_Config.iTexScalingLevel < TEXSCALING_OFF) + g_Config.iTexScalingLevel = TEXSCALING_OFF; else if (g_Config.iTexScalingLevel > TEXSCALING_MAX) g_Config.iTexScalingLevel = TEXSCALING_MAX; for (int i = 0; i < ARRAY_SIZE(texscalingitems); i++) { - CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | ((i == g_Config.iTexScalingLevel) ? MF_CHECKED : MF_UNCHECKED)); + // OFF is 1, skip 0. + bool selected = i + 1 == g_Config.iTexScalingLevel; + CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | (selected ? MF_CHECKED : MF_UNCHECKED)); } if (g_Config.iGPUBackend == (int)GPUBackend::OPENGL && !gl_extensions.OES_texture_npot) { diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index a04e5ece65..6e2f2d4657 100644 --- a/Windows/ppsspp.rc +++ b/Windows/ppsspp.rc @@ -633,7 +633,6 @@ BEGIN POPUP "Texture Scaling", ID_OPTIONS_TEXTURESCALING_MENU BEGIN MENUITEM "Off", ID_TEXTURESCALING_OFF - MENUITEM "Auto", ID_TEXTURESCALING_AUTO MENUITEM "&2x", ID_TEXTURESCALING_2X MENUITEM "&3x", ID_TEXTURESCALING_3X MENUITEM "&4x", ID_TEXTURESCALING_4X diff --git a/Windows/resource.h b/Windows/resource.h index 95742e1999..ce21b3a85a 100644 --- a/Windows/resource.h +++ b/Windows/resource.h @@ -246,7 +246,6 @@ #define IDC_GEDBG_STEPFRAME 40134 #define IDC_GEDBG_BREAKTEX 40135 #define ID_OPTIONS_PAUSE_FOCUS 40136 -#define ID_TEXTURESCALING_AUTO 40137 #define IDC_GEDBG_STEPPRIM 40138 #define ID_DISASM_ADDFUNCTION 40139 #define ID_DISASM_REMOVEFUNCTION 40140