Texture shader UI cleanup

UI/GameSettingsScreen.cpp

@@ -530,15 +530,22 @@ void GameSettingsScreen::CreateGraphicsSettings(UI::ViewGroup *graphicsSettings)
 		return DoesBackendSupportHWTess() && !g_Config.bSoftwareRendering && g_Config.bHardwareTransform;
 	});
 
-	graphicsSettings->Add(new ItemHeader(gr->T("Texture Scaling")));
+	graphicsSettings->Add(new ItemHeader(gr->T("Texture upscaling")));
+
+	if (GetGPUBackend() == GPUBackend::VULKAN) {
+		ChoiceWithValueDisplay *textureShaderChoice = graphicsSettings->Add(new ChoiceWithValueDisplay(&g_Config.sTextureShaderName, gr->T("GPU texture upscaler (fast)"), &TextureTranslateName));
+		textureShaderChoice->OnClick.Handle(this, &GameSettingsScreen::OnTextureShader);
+		textureShaderChoice->SetDisabledPtr(&g_Config.bSoftwareRendering);
+	}
+
 #ifndef MOBILE_DEVICE
 	static const char *texScaleLevels[] = {"Off", "2x", "3x", "4x", "5x"};
 #else
 	static const char *texScaleLevels[] = {"Off", "2x", "3x"};
 #endif
 
 	static const char *texScaleAlgos[] = { "xBRZ", "Hybrid", "Bicubic", "Hybrid + Bicubic", };
-	PopupMultiChoice *texScalingType = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iTexScalingType, gr->T("Upscale Type"), texScaleAlgos, 0, ARRAY_SIZE(texScaleAlgos), I18NCat::GRAPHICS, screenManager()));
+	PopupMultiChoice *texScalingType = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iTexScalingType, gr->T("CPU texture upscaler (slow)"), texScaleAlgos, 0, ARRAY_SIZE(texScaleAlgos), I18NCat::GRAPHICS, screenManager()));
 	texScalingType->SetEnabledFunc([]() {
 		return !g_Config.bSoftwareRendering && !UsingHardwareTextureScaling();
 	});
@@ -569,12 +576,6 @@ void GameSettingsScreen::CreateGraphicsSettings(UI::ViewGroup *graphicsSettings)
 		return !g_Config.bSoftwareRendering && !UsingHardwareTextureScaling();
 	});
 
-	ChoiceWithValueDisplay *textureShaderChoice = graphicsSettings->Add(new ChoiceWithValueDisplay(&g_Config.sTextureShaderName, gr->T("Texture Shader"), &TextureTranslateName));
-	textureShaderChoice->OnClick.Handle(this, &GameSettingsScreen::OnTextureShader);
-	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" };
 	PopupMultiChoice *anisoFiltering = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iAnisotropyLevel, gr->T("Anisotropic Filtering"), anisoLevels, 0, ARRAY_SIZE(anisoLevels), I18NCat::GRAPHICS, screenManager()));

assets/lang/ar_AE.ini

@@ -618,6 +618,7 @@ Cardboard Screen Y Shift = Y shift (in % of the blank space)
 Cardboard VR Settings = Google Cardboard VR settings
 Cheats = الغش
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = ‎نوع التكبير (CPU)
 Current GPU Driver = Current GPU Driver
 Debugging = ‎التصحيح
 Default GPU driver = Default GPU driver
@@ -640,6 +641,7 @@ Frame Skipping = ‎تخطي الإطارات
 Frame Skipping Type = نوع تخطي الإطارات
 FullScreen = ‎الشاشة الكاملة
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = GPU texture upscaler (fast)
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack settings (may cause glitches)
 Hardware Tessellation = Hardware tessellation
@@ -709,15 +711,13 @@ Stretch = ‎المط
 Texture Filter = ‎منقي الرسوم
 Texture Filtering = ‎مفلتر الرسوم
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = ‎تكبير الرسوم
-Texture Shader = Texture shader
+Texture upscaling = ‎تكبير الرسوم
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Turn off "hardware tessellation": unsupported
 Unlimited = ‎لا محدود
 Up to 1 = Up to 1
 Up to 2 = Up to 2
 Upscale Level = ‎مستوي التكبير
-Upscale Type = ‎نوع التكبير
 UpscaleLevel Tip = CPU heavy - some scaling may be delayed to avoid stutter
 Use all displays = Use all displays
 VSync = VSync

assets/lang/az_AZ.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Y shift (in % of the blank space)
 Cardboard VR Settings = Google Cardboard VR settings
 Cheats = Cheats
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Upscale type
 Current GPU Driver = Current GPU Driver
 Debugging = Debugging
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Kvadrat Keçid et (Sürət)
 Frame Skipping Type = Frame skipping type
 FullScreen = Fullscreen
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = Texture shader
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack settings (may cause glitches)
 Hardware Tessellation = Hardware tessellation
@@ -701,15 +703,13 @@ Stretch = Stretch
 Texture Filter = Texture filtering
 Texture Filtering = Texture filtering
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Texture scaling
-Texture Shader = Texture shader
+Texture upscaling = Texture scaling
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Turn off "hardware tessellation": unsupported
 Unlimited = Unlimited
 Up to 1 = Up to 1
 Up to 2 = Up to 2
 Upscale Level = Upscale level
-Upscale Type = Upscale type
 UpscaleLevel Tip = CPU heavy - some scaling may be delayed to avoid stutter
 Use all displays = Use all displays
 VSync = VSync

assets/lang/bg_BG.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Y shift (in % of the blank space)
 Cardboard VR Settings = Google Cardboard VR settings
 Cheats = Cheats
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Upscale type
 Current GPU Driver = Current GPU Driver
 Debugging = Debugging
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Прескачане на кадри
 Frame Skipping Type = Frame skipping type
 FullScreen = Цял екран
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = GPU texture upscaler (fast)
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack settings (may cause glitches)
 Hardware Tessellation = Hardware tessellation
@@ -701,15 +703,13 @@ Stretch = Stretch
 Texture Filter = Текстурно филтриране
 Texture Filtering = Текстурно филтриране
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Текстурно мащабиране
-Texture Shader = Texture shader
+Texture upscaling = Текстурно мащабиране
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Turn off "hardware tessellation": unsupported
 Unlimited = Unlimited
 Up to 1 = Up to 1
 Up to 2 = Up to 2
 Upscale Level = Upscale level
-Upscale Type = Upscale type
 UpscaleLevel Tip = CPU heavy - some scaling may be delayed to avoid stutter
 Use all displays = Use all displays
 VSync = VSync

assets/lang/ca_ES.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Desplaçament vertical (en % de l'espai en blanc)
 Cardboard VR Settings = Configuració de "Google Cardboard VR"
 Cheats = Trucs
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Tipus d'escalat
 Current GPU Driver = Current GPU Driver
 Debugging = Depuració
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Saltar quadres
 Frame Skipping Type = Tipus de salt de quadres
 FullScreen = Pantalla completa
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = Shader de textura (GPU)
 GPUReadbackRequired = AVÍS: Aquest joc requereix "Saltar la lectura de GPU" desactivat.
 Hack Settings = Configuració de hacks (causaran errors gràfics)
 Hardware Tessellation = Tesellat per maquinari
@@ -701,15 +703,13 @@ Stretch = Estirar
 Texture Filter = Filtre de textures
 Texture Filtering = Filtrat de textures
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Escalat de textures
-Texture Shader = Shader de textura
+Texture upscaling = Escalat de textures
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Desactivant tessel·lat per maquinari: no suportat.
 Unlimited = Il·limitat
 Up to 1 = Fins a 1
 Up to 2 = Fins a 2
 Upscale Level = Nivell d'escalat
-Upscale Type = Tipus d'escalat
 UpscaleLevel Tip = Exigeix consum de CPU, alguns escalats es poden retardar per evitar estrebades.
 Use all displays = Usar totes les pantalles
 VSync = Sincronització vertical (VSync)

assets/lang/cz_CZ.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Posunutí osy Y (v % prázdného prostoru)
 Cardboard VR Settings = Nastavení Google Cardboard VR
 Cheats = Cheats
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Typ zvětšení
 Current GPU Driver = Current GPU Driver
 Debugging = Ladění
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Přeskakování snímků
 Frame Skipping Type = Frame skipping type
 FullScreen = Režim celé obrazovky
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = GPU texture upscaler (fast)
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Nastavení hacků (Mohou způsobit problémy)
 Hardware Tessellation = Hardware tessellation
@@ -701,15 +703,13 @@ Stretch = Roztažení
 Texture Filter = Filtr textur
 Texture Filtering = Filtrování textur
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Změna velikosti textur
-Texture Shader = Texture shader
+Texture upscaling = Změna velikosti textur
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Turn off "hardware tessellation": unsupported
 Unlimited = Neomezené
 Up to 1 = Up to 1
 Up to 2 = Up to 2
 Upscale Level = Úroveň zvětšení
-Upscale Type = Typ zvětšení
 UpscaleLevel Tip = CPU heavy - some scaling may be delayed to avoid stutter
 Use all displays = Use all displays
 VSync = Vertikální synchronizace

assets/lang/da_DK.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Y skift (i % af det ugyldige)
 Cardboard VR Settings = Google Cardboard VR indstillinger
 Cheats = Cheats
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Opskaleringstype
 Current GPU Driver = Current GPU Driver
 Debugging = Fejlfinding
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Frameskipping
 Frame Skipping Type = Frame skipping type
 FullScreen = Fuldskærm
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = GPU texture upscaler (fast)
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack indstillinger (kan give fejl)
 Hardware Tessellation = Hardware tessellation
@@ -701,15 +703,13 @@ Stretch = Stretch
 Texture Filter = Texturfilter
 Texture Filtering = Texturfiltrering
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Texturskalering
-Texture Shader = Texture shader
+Texture upscaling = Texturskalering
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Turn off "hardware tessellation": unsupported
 Unlimited = Ubegrænset
 Up to 1 = Up to 1
 Up to 2 = Up to 2
 Upscale Level = Opskaleringsniveau
-Upscale Type = Opskaleringstype
 UpscaleLevel Tip = CPU tung - noget skallering kan belive forsinket for at undgå flimmer
 Use all displays = Use all displays
 VSync = VSync

assets/lang/de_DE.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Y Versatz (in % der freien Fläche)
 Cardboard VR Settings = Google Cardboard VR Einstellungen
 Cheats = Cheats
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Skalierungsart
 Current GPU Driver = Current GPU Driver
 Debugging = Debugging
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Bilder überspringen
 Frame Skipping Type = Typ für Bilder überspringen
 FullScreen = Vollbild
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = GPU texture upscaler (fast)
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hacks (kann zu Fehlern führen)
 Hardware Tessellation = Hardware Tessellation
@@ -701,15 +703,13 @@ Stretch = Strecken
 Texture Filter = Texturfilter
 Texture Filtering = Texturfilterung
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Texturskalierung
-Texture Shader = Texture shader
+Texture upscaling = Texturskalierung
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = "Hardware Tessellierung" ausschalten: Nicht unterstützt
 Unlimited = Unbegrenzt
 Up to 1 = Up to 1
 Up to 2 = Up to 2
 Upscale Level = Skalierungsgrad
-Upscale Type = Skalierungsart
 UpscaleLevel Tip = CPU-lastig - einige Skalierungen könnten verzögert sein um Stottern zu vermeiden
 Use all displays = Benutze alle Bildschirme
 VSync = V-Sync

assets/lang/dr_ID.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Y shift (in % of the blank space)
 Cardboard VR Settings = Google Cardboard VR settings
 Cheats = Cheats
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Skala apa mane?
 Current GPU Driver = Current GPU Driver
 Debugging = Debug
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Frameskip
 Frame Skipping Type = Frame skipping type
 FullScreen = Layar pol
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = GPU texture upscaler (fast)
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Hack Settings = Hack settings (may cause glitches)
 Hardware Tessellation = Hardware tessellation
@@ -701,15 +703,13 @@ Stretch = Stretch
 Texture Filter = Panyaring Texture
 Texture Filtering = Saring i Texture
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Petonggoi Texture
-Texture Shader = Texture shader
+Texture upscaling = Petonggoi Texture
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Turn off "hardware tessellation": unsupported
 Unlimited = Unlimited
 Up to 1 = Up to 1
 Up to 2 = Up to 2
 Upscale Level = Patonggoi skala
-Upscale Type = Skala apa mane?
 UpscaleLevel Tip = CPU heavy - some scaling may be delayed to avoid stutter
 Use all displays = Use all displays
 VSync = VSync

assets/lang/en_US.ini

@@ -624,12 +624,14 @@ Backend = Backend
 Balanced = Balanced
 Bicubic = Bicubic
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Upscale type
 Current GPU Driver = Current GPU Driver
 Default GPU driver = Default GPU driver
 Disable culling = Disable culling
 Display layout & effects = Display layout & effects
 Driver requires Android API version %1, current is %2 = Driver requires Android API version %1, current is %2
 Drivers = Drivers
+GPU texture upscaler (fast) = GPU texture upscaler (fast)
 GPUReadbackRequired = Warning: This game requires "Skip GPU Readbacks" to be set to Off.
 Both = Both
 Buffer graphics commands (faster, input lag) = Buffer graphics commands (faster, input lag)
@@ -725,15 +727,13 @@ Stretch = Stretch
 Texture Filter = Texture filtering
 Texture Filtering = Texture filtering
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Texture scaling
-Texture Shader = Texture shader
+Texture upscaling = Texture scaling
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Turn off "hardware tessellation": unsupported
 Unlimited = Unlimited
 Up to 1 = Up to 1
 Up to 2 = Up to 2
 Upscale Level = Upscale level
-Upscale Type = Upscale type
 UpscaleLevel Tip = CPU heavy - some scaling may be delayed to avoid stutter
 Use all displays = Use all displays
 VSync = VSync

assets/lang/es_ES.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Desplazamiento vertical (en % del espacio en blanco)
 Cardboard VR Settings = Ajustes de "Google Cardboard VR"
 Cheats = Trucos
 Copy to texture = Copy to texture
+CPU texture upscaler (slow) = Tipo de escalado
 Current GPU Driver = Current GPU Driver
 Debugging = Depuración
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Saltar cuadros
 Frame Skipping Type = Tipo de salto de cuadros
 FullScreen = Pantalla completa
 Geometry shader culling = Eliminado de sombras geométricas
+GPU texture upscaler (fast) = Shader de textura (GPU)
 GPUReadbackRequired = AVISO: Este juego requiere "Saltar la lectura de GPU" desactivado.
 Hack Settings = Ajustes de hacks (causarán errores gráficos)
 Hardware Tessellation = Teselado por hardware
@@ -701,15 +703,13 @@ Stretch = Estirar
 Texture Filter = Filtro de texturas
 Texture Filtering = Filtrado de texturas
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Escalado de texturas
-Texture Shader = Shader de textura
+Texture upscaling = Escalado de texturas
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Desactivando teselado por hardware: no soportado.
 Unlimited = Ilimitado
 Up to 1 = Hasta 1
 Up to 2 = Hasta 2
 Upscale Level = Nivel de escalado
-Upscale Type = Tipo de escalado
 UpscaleLevel Tip = Exige consumo de CPU, algunos escalados se pueden retrasar para evitar tirones.
 Use all displays = Usar todas las pantallas
 VSync = Sincronía vertical (VSync)

assets/lang/es_LA.ini

@@ -610,6 +610,7 @@ Cardboard Screen Y Shift = Desplazamiento Y (en % del espacio en blanco)
 Cardboard VR Settings = Configurar Google Cardboard VR
 Cheats = Trucos
 Copy to texture = Copiar a la textura
+CPU texture upscaler (slow) = Tipo de escalado
 Current GPU Driver = Current GPU Driver
 Debugging = Depuración
 Default GPU driver = Default GPU driver
@@ -632,6 +633,7 @@ Frame Skipping = Salto de cuadros
 Frame Skipping Type = Tipo de salto de cuadros
 FullScreen = Pantalla completa
 Geometry shader culling = Geometry shader culling
+GPU texture upscaler (fast) = Shader de texturas
 GPUReadbackRequired = Warning: Este juego requiere que "Omitir lecturas de GPU" esté desactivado.
 Hack Settings = Ajustes de hacks (puede causar glitches)
 Hardware Tessellation = Teselado por Hardware
@@ -701,15 +703,13 @@ Stretch = Estirar
 Texture Filter = Filtro de texturas
 Texture Filtering = Filtrado de texturas
 Texture replacement pack activated = Texture replacement pack activated
-Texture Scaling = Escalado de texturas
-Texture Shader = Shader de texturas
+Texture upscaling = Escalado de texturas
 The chosen ZIP file doesn't contain a valid driver = The chosen ZIP file doesn't contain a valid driver
 Turn off Hardware Tessellation - unsupported = Desactivando Teselado por Hardware: no es soportado.
 Unlimited = Ilimitado
 Up to 1 = Hasta 1
 Up to 2 = Hasta 2
 Upscale Level = Nivel de escalado
-Upscale Type = Tipo de escalado
 UpscaleLevel Tip = Consume tanta CPU. Cierto escalado se retrasa para evitar caídas de frames.
 Use all displays = Usar todas las muestras
 VSync = Sincronía vertical (VSync)