Merge pull request #16346 from hrydgard/remove-retain-changed-texture…

…s-setting

Change the "Retain changed textures" option into a compat.ini option.

Core/Compatibility.cpp

@@ -118,6 +118,7 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
 	CheckSetting(iniFile, gameID, "ForceLowerResolutionForEffectsOn", &flags_.ForceLowerResolutionForEffectsOn);
 	CheckSetting(iniFile, gameID, "AllowDownloadCLUT", &flags_.AllowDownloadCLUT);
 	CheckSetting(iniFile, gameID, "NearestFilteringOnFramebufferCreate", &flags_.NearestFilteringOnFramebufferCreate);
+	CheckSetting(iniFile, gameID, "SecondaryTextureCache", &flags_.SecondaryTextureCache);
 }
 
 void Compatibility::CheckVRSettings(IniFile &iniFile, const std::string &gameID) {

Core/Compatibility.h

@@ -89,6 +89,7 @@ struct CompatFlags {
 	bool ForceLowerResolutionForEffectsOn;
 	bool AllowDownloadCLUT;
 	bool NearestFilteringOnFramebufferCreate;
+	bool SecondaryTextureCache;
 };
 
 struct VRCompat {

Core/Config.cpp

@@ -904,7 +904,6 @@ static ConfigSetting graphicsSettings[] = {
 
 	ReportedConfigSetting("VertexDecCache", &g_Config.bVertexCache, false, true, true),
 	ReportedConfigSetting("TextureBackoffCache", &g_Config.bTextureBackoffCache, false, true, true),
-	ReportedConfigSetting("TextureSecondaryCache", &g_Config.bTextureSecondaryCache, false, true, true),
 	ReportedConfigSetting("VertexDecJit", &g_Config.bVertexDecoderJit, &DefaultCodeGen, false),
 
 #ifndef MOBILE_DEVICE

Core/Config.h

@@ -199,7 +199,6 @@ struct Config {
 
 	bool bVertexCache;
 	bool bTextureBackoffCache;
-	bool bTextureSecondaryCache;
 	bool bVertexDecoderJit;
 	bool bFullScreen;
 	bool bFullScreenMulti;

GPU/Common/TextureCacheCommon.cpp

@@ -767,7 +767,7 @@ void TextureCacheCommon::Decimate(bool forcePressure) {
 	}
 
 	// If enabled, we also need to clear the secondary cache.
-	if (g_Config.bTextureSecondaryCache && (forcePressure || secondCacheSizeEstimate_ >= TEXCACHE_SECOND_MIN_PRESSURE)) {
+	if (PSP_CoreParameter().compat.flags().SecondaryTextureCache && (forcePressure || secondCacheSizeEstimate_ >= TEXCACHE_SECOND_MIN_PRESSURE)) {
 		const u32 had = secondCacheSizeEstimate_;
 
 		for (TexCache::iterator iter = secondCache_.begin(); iter != secondCache_.end(); ) {
@@ -2409,7 +2409,7 @@ bool TextureCacheCommon::CheckFullHash(TexCacheEntry *entry, bool &doDelete) {
 	}
 
 	// Don't give up just yet.  Let's try the secondary cache if it's been invalidated before.
-	if (g_Config.bTextureSecondaryCache) {
+	if (PSP_CoreParameter().compat.flags().SecondaryTextureCache) {
 		// Don't forget this one was unreliable (in case we match a secondary entry.)
 		entry->status |= TexCacheEntry::STATUS_UNRELIABLE;
 

UI/GameSettingsScreen.cpp

@@ -545,13 +545,6 @@ void GameSettingsScreen::CreateViews() {
 		return UI::EVENT_CONTINUE;
 	});
 
-	CheckBox *texSecondary_ = graphicsSettings->Add(new CheckBox(&g_Config.bTextureSecondaryCache, gr->T("Retain changed textures", "Retain changed textures (speedup, mem hog)")));
-	texSecondary_->OnClick.Add([=](EventParams &e) {
-		settingInfo_->Show(gr->T("RetainChangedTextures Tip", "Makes many games slower, but some games a lot faster"), e.v);
-		return UI::EVENT_CONTINUE;
-	});
-	texSecondary_->SetDisabledPtr(&g_Config.bSoftwareRendering);
-
 	// Seems solid, so we hide the setting.
 	/*CheckBox *vtxJit = graphicsSettings->Add(new CheckBox(&g_Config.bVertexDecoderJit, gr->T("Vertex Decoder JIT")));
 

assets/compat.ini

@@ -1240,3 +1240,27 @@ NPJH50366 = true
 [AllowDownloadCLUT]
 # Temporary compatibility option, while working on the GPU CLUT-from-framebuffer path.
 # Not required for any games now that it works, but might be useful for development.
+
+[SecondaryTextureCache]
+# Was previously the "Retain changed textures" setting.
+# See https://github.com/hrydgard/ppsspp/issues/16339#issuecomment-1304826656
+
+# Popolocrois
+UCJS10005 = true
+UCAS40009 = true
+ULUS10018 = true
+UCJS18003 = true
+ULES00291 = true
+NPJG00033 = true
+
+# Fushigi no Dungeon: Fuurai no Shiren 4 Plus - Kami no Hitomi to Akuma no Heso
+ULJS00547 = true
+NPJH50698 = true
+
+# Final Fantasy Tactics
+UCAS40148 = true
+ULJM05194 = true
+ULES00850 = true
+ULUS10297 = true
+ULJM05516 = true
+NPJH50408 = true

assets/lang/ar_AE.ini

@@ -550,8 +550,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = ‎وضع التصيير
 Rendering Resolution = ‎حجم التصيير
 RenderingMode NonBuffered Tip = ‎أسرع, لكن يمكن أن لا يظهر أي شئ في بعض الألعاب
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = ‎يجعل ألعاب كثيرة بطيئة, لكن بعض الألعاب أسرع
 Rotation = ‎الدوران
 Safe = ‎أمن
 Screen layout = Screen layout

assets/lang/az_AZ.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Rendering mode
 Rendering Resolution = Rendering resolution
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/bg_BG.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Rendering mode
 Rendering Resolution = Rendering resolution
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/ca_ES.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Rendering mode
 Rendering Resolution = Rendering resolution
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/cz_CZ.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Režim vykreslování
 Rendering Resolution = Rozlišení vykreslování
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Zachovat změněné textury (někdy pomalejší)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Otočení
 Safe = Bezpečné
 Screen layout = Screen layout

assets/lang/da_DK.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Rendering tilstand
 Rendering Resolution = Render opløsning
 RenderingMode NonBuffered Tip = Hurtigere, men intet vises i nogle spil
-Retain changed textures = Behold ændrede textures (nogle gange langsommere)
-RetainChangedTextures Tip = Gør mange spil langsommere, men nogle spil er meget hurtigere
 Rotation = Rotation
 Safe = Sikker
 Screen layout = Screen layout

assets/lang/de_DE.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Kann Framerate smoother in Spielen machen, die eine
 Rendering Mode = Rendermodus
 Rendering Resolution = Renderauflösung
 RenderingMode NonBuffered Tip = Schneller, aber keine Anzeige in einigen Spielen
-Retain changed textures = Veränderte Texturen behalten (manchmal langsamer)
-RetainChangedTextures Tip = Macht viele Spiele langsamer, aber einige andere umso schneller
 Rotation = Drehung
 Safe = Sicher
 Screen layout = Screen layout

assets/lang/dr_ID.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Pa marrender i
 Rendering Resolution = Rendering resolution
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/es_ES.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Puede hacer la imagen más fluida in juegos con una
 Rendering Mode = Modo de renderizado
 Rendering Resolution = Resolución de renderizado
 RenderingMode NonBuffered Tip = Rápido, pero no se verá nada en algunos juegos.
-Retain changed textures = Mantener texturas cambiadas
-RetainChangedTextures Tip = Hace muchos juegos más lentos, pero unos pocos mucho más rápidos.
 Rotation = Rotación
 Safe = Seguro
 Screen layout = Diseño de pantalla

assets/lang/es_LA.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Puede hacer que la fluidez sea más suave en juegos
 Rendering Mode = Modo de renderizado
 Rendering Resolution = Resolución de renderizado
 RenderingMode NonBuffered Tip = Acelera, pero no podrá generar gráficos en algunos juegos.
-Retain changed textures = Mantener texturas cambiadas
-RetainChangedTextures Tip = Ralentiza muchos juegos, pero acelera algunos.
 Rotation = Rotación
 Safe = Seguro
 Screen layout = Disposición de pantalla

assets/lang/fa_IR.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = ‎حالت رندرینگ
 Rendering Resolution = ‎رزولوشن رندرینگ
 RenderingMode NonBuffered Tip = ‎سریع تر، اما در بعضی بازی ها ممکن است چیزی نشان ندهد
-Retain changed textures = ‎کش کردن تکسچر های تغییر یافته (بعضی مواقع کندتر)
-RetainChangedTextures Tip = ‎برای بسیاری از بازی ها کندتر و برای بعضی سریع تر
 Rotation = ‎چرخش
 Safe = ‎امن
 Screen layout = Screen layout

assets/lang/fi_FI.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Rendering mode
 Rendering Resolution = Rendering resolution
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/fr_FR.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Peut améliorer la fluidité dans les jeux qui fonct
 Rendering Mode = Mode de rendu
 Rendering Resolution = Définition du rendu
 RenderingMode NonBuffered Tip = Plus rapide, mais pour certains jeux rien ne s'affichera
-Retain changed textures = Conserver les textures modifiées (seulement certains jeux)
-RetainChangedTextures Tip = Ralentit de nombreux jeux, mais beaucoup plus rapide pour quelques autres
 Rotation = Rotation
 Safe = Prudent
 Screen layout = Disposition de l'écran

assets/lang/gl_ES.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Modo de renderizado
 Rendering Resolution = Resolución de renderizado
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Seguro
 Screen layout = Screen layout

assets/lang/gr_EL.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Τρόπος Απεικόνισης
 Rendering Resolution = Ανάλυση Απεικόνισης
 RenderingMode NonBuffered Tip = Γρηγορότερο, αλλά σε μερικά αιχνίδια μπορεί να μην εμφανίζει τίποτα
-Retain changed textures = Διατηρήστε αλλαγμένων υφών (μερικές φορές αργότερο)
-RetainChangedTextures Tip = Κάνει πολλά παιχνίδια πιο αργά, αλλά κάποια άλλα πιο γρήγορα
 Rotation = Περιστροφή
 Safe = Ασφαλής
 Screen layout = Screen layout

assets/lang/he_IL.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = מצב מעובד
 Rendering Resolution = Rendering resolution
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/he_IL_invert.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = דבועמ בצמ
 Rendering Resolution = Rendering resolution
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/hr_HR.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Izlgađiva frameove u igrama koje ih jako malo imaju
 Rendering Mode = Način prikaza
 Rendering Resolution = Rezolucija prikaza
 RenderingMode NonBuffered Tip = Brže, ali ništa može uvući neke igre
-Retain changed textures = Ostavi promijenjene teksture (ponekad sporije)
-RetainChangedTextures Tip = Usporava mnogo igara, ali neke igre dosta ubrzava
 Rotation = Rotacija
 Safe = Sigurno
 Screen layout = Screen layout

assets/lang/hu_HU.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Simábbá teheti az alacsonyabb képkocka számon fu
 Rendering Mode = Renderelés módja
 Rendering Resolution = Renderelés felbontása
 RenderingMode NonBuffered Tip = Gyorsabb, de egyes játékokban nem rajzol ki semmit.
-Retain changed textures = Változtatott textúrák megtartása (olykor lassabb)
-RetainChangedTextures Tip = Egyes játékokat gyorsít, de sok játékot lassít.
 Rotation = Forgatás
 Safe = Biztonságos
 Screen layout = Screen layout

assets/lang/id_ID.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Dapat membuat laju bingkai lebih lancar dalam permai
 Rendering Mode = Mode pelukisan
 Rendering Resolution = Resolusi pelukisan
 RenderingMode NonBuffered Tip = Lebih cepat, namun mungkin tidak ada gambar di beberapa permainan
-Retain changed textures = Tahan tekstur yang berubah (adakalanya lambat)
-RetainChangedTextures Tip = Membuat beberapa permainan lambat, namun beberapa lainnya sangat cepat
 Rotation = Rotasi
 Safe = Aman
 Screen layout = Tata letak layar

assets/lang/it_IT.ini

@@ -543,8 +543,6 @@ RenderDuplicateFrames Tip = Può migliorare la fluidità nei giochi che funziona
 Rendering Mode = Modalità di Rendering
 Rendering Resolution = Rendering della Risoluzione
 RenderingMode NonBuffered Tip = Veloce, ma potrebbe generare dei glitch in alcuni giochi
-Retain changed textures = Conserva le textures modificate (a volte è lento)
-RetainChangedTextures Tip = Rallenta molti giochi, ma alcuni saranno velocizzati
 Rotation = Rotazione
 Safe = Sicuro
 Screen layout = Disposizione dello schermo

assets/lang/ja_JP.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = フレームレートが低いゲームでフレー
 Rendering Mode = レンダリングモード
 Rendering Resolution = レンダリング解像度
 RenderingMode NonBuffered Tip = 高速ですが何も表示されなくなるゲームがあるかもしれません
-Retain changed textures = 変更したテクスチャを保持する (低速化する場合がある)
-RetainChangedTextures Tip = 多くのゲームが低速化しますが、かなり速くなるゲームもあります
 Rotation = 向き
 Safe = セーフ
 Screen layout = 画面のレイアウト

assets/lang/jv_ID.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Mode Rendering
 Rendering Resolution = Rendering résolusi
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Makaryakke diganti tekstur (kadhangkala luwih alon)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotasi
 Safe = Aman
 Screen layout = Screen layout

assets/lang/ko_KR.ini

@@ -541,8 +541,6 @@ RenderDuplicateFrames Tip = 낮은 프레임 속도에서 실행되는 게임에
 Rendering Mode = 렌더링 모드
 Rendering Resolution = 렌더링 해상도
 RenderingMode NonBuffered Tip = 더 빠르지만 일부 게임에서는 아무 것도 표현되지 않을 수 있습니다.
-Retain changed textures = 변경된 텍스처 유지 (때로는 느림)
-RetainChangedTextures Tip = 많은 게임을 느리게 하지만 일부 게임은 훨씬 빠르게 만듭니다.
 Rotation = 회전
 Safe = 안전
 Screen layout = 화면 레이아웃

assets/lang/lo_LA.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = ໂໝດການສະແດງຜົນ
 Rendering Resolution = ຄວາມລະອຽດຂອງການສະແດງຜົນ
 RenderingMode NonBuffered Tip = ໄວຂຶ້ນແທ້, ແຕ່ອາດມີອາການຈໍດຳໃນບາງເກມ
-Retain changed textures = ຮັກສາການປ່ຽນແປງຂອງພື້ນຜິວ (ຊ້າບາງເທື່ອ)
-RetainChangedTextures Tip = ບາງເກມໃຊ້ແລ້ວຄວາມໄວຫຼຸດລົງ ແຕ່ບາງເກມຄວາມໄວກໍເພີ່ມຂຶ້ນ
 Rotation = ໝຸນຈໍ
 Safe = ປອດໄພ
 Screen layout = Screen layout

assets/lang/lt-LT.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Rodymo režimas
 Rendering Resolution = Rodymo rezoliucija
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/ms_MY.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Mod rendering
 Rendering Resolution = Resolusi rendering
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/nl_NL.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Weergavemodus
 Rendering Resolution = Renderresolutie
 RenderingMode NonBuffered Tip = Sneller, maar mogelijk wordt in sommige games niets gerenderd
-Retain changed textures = Gewijzigde textures behouden (soms trager)
-RetainChangedTextures Tip = Maakt vele games trager, maar sommige games veel sneller
 Rotation = Rotatie
 Safe = Veilig
 Screen layout = Screen layout

assets/lang/no_NO.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Rendering mode
 Rendering Resolution = Rendering resolution
 RenderingMode NonBuffered Tip = Faster, but nothing may draw in some games
-Retain changed textures = Retain changed textures (sometimes slower)
-RetainChangedTextures Tip = Makes many games slower, but some games a lot faster
 Rotation = Rotation
 Safe = Safe
 Screen layout = Screen layout

assets/lang/pl_PL.ini

@@ -542,8 +542,6 @@ RenderDuplicateFrames Tip = Can make framerate smoother in games that run at low
 Rendering Mode = Tryb renderowania
 Rendering Resolution = Rozdzielczość renderowania
 RenderingMode NonBuffered Tip = Szybsze, ale niektóre gry mogą się nie wyświetlać
-Retain changed textures = Zachowuj zmienione tekstury (czasem wolniejsze)
-RetainChangedTextures Tip = Spowalnia wiele gier, ale mocno przyspiesza kilka innych
 Rotation = Obrót
 Safe = Bezpieczne
 Screen layout = Screen layout

assets/lang/pt_BR.ini

@@ -565,8 +565,6 @@ RenderDuplicateFrames Tip = Pode tornar a taxa dos frames mais suave em jogos qu
 Rendering Mode = Modo de renderização
 Rendering Resolution = Resolução da renderização
 RenderingMode NonBuffered Tip = Mais rápido, mas nada pode ser desenhado em alguns jogos
-Retain changed textures = Reter texturas mudadas (as vezes mais lento)
-RetainChangedTextures Tip = Torna muitos jogos mais lentos mas alguns jogos muito mais rápidos
 Rotation = Rotação
 Safe = Seguro
 Screen layout = Esquema da tela