Merge pull request #22332 from sum2012/remove-hack

Remove hack

Core/Compatibility.cpp

@@ -144,7 +144,6 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
 	CheckSetting(iniFile, gameID, "DaxterRotatedAnalogStick", &flags_.DaxterRotatedAnalogStick);
 	CheckSetting(iniFile, gameID, "ForceMaxDepthResolution", &flags_.ForceMaxDepthResolution);
 	CheckSetting(iniFile, gameID, "SOCOMClut8Replacement", &flags_.SOCOMClut8Replacement);
-	CheckSetting(iniFile, gameID, "Fontltn12Hack", &flags_.Fontltn12Hack);
 	CheckSetting(iniFile, gameID, "LoadCLUTFromCurrentFrameOnly", &flags_.LoadCLUTFromCurrentFrameOnly);
 	CheckSetting(iniFile, gameID, "ForceUMDReadSpeed", &flags_.ForceUMDReadSpeed);
 	CheckSetting(iniFile, gameID, "KernelGetSystemTimeLowEatMoreCycles", &flags_.KernelGetSystemTimeLowEatMoreCycles);
@@ -157,7 +156,6 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
 	CheckSetting(iniFile, gameID, "DisableHLESceFont", &flags_.DisableHLESceFont);
 	CheckSetting(iniFile, gameID, "ForceHLEPsmf", &flags_.ForceHLEPsmf);
 	CheckSetting(iniFile, gameID, "SaveStatesNotRecommended", &flags_.SaveStatesNotRecommended);
-	CheckSetting(iniFile, gameID, "IgnoreEnqueue", &flags_.IgnoreEnqueue);
 	CheckSetting(iniFile, gameID, "MsgDialogAutoStatus", &flags_.MsgDialogAutoStatus);
 	CheckSetting(iniFile, gameID, "NullPageValid", &flags_.NullPageValid);
 	CheckSetting(iniFile, gameID, "DetectDestBlendSquared", &flags_.DetectDestBlendSquared);

Core/Compatibility.h

@@ -99,7 +99,6 @@ struct CompatFlags {
 	bool DaxterRotatedAnalogStick;
 	bool ForceMaxDepthResolution;
 	bool SOCOMClut8Replacement;
-	bool Fontltn12Hack;
 	bool LoadCLUTFromCurrentFrameOnly;
 	bool ForceUMDReadSpeed;
 	bool KernelGetSystemTimeLowEatMoreCycles;
@@ -112,7 +111,6 @@ struct CompatFlags {
 	bool DisableHLESceFont;
 	bool ForceHLEPsmf;
 	bool SaveStatesNotRecommended;
-	bool IgnoreEnqueue;
 	bool MsgDialogAutoStatus;
 	bool NullPageValid;
 	bool DetectDestBlendSquared;

Core/HLE/sceFont.cpp

@@ -1311,18 +1311,6 @@ static int sceFontFindOptimumFont(u32 libHandle, u32 fontStylePtr, u32 errorCode
 	Font *nearestFont = 0;
 	float nearestDist = std::numeric_limits<float>::infinity();
 
-	if (PSP_CoreParameter().compat.flags().Fontltn12Hack && requestedStyle->fontLanguage == 2) {
-		for (size_t j = 0; j < internalFonts.size(); j++) {
-			const auto &tempmatchStyle = internalFonts[j]->GetFontStyle();
-			const std::string str(tempmatchStyle.fontFileName);
-			if (str == "ltn12.pgf") {
-				optimumFont = internalFonts[j];
-				*errorCode = 0;
-				return hleLogInfo(Log::sceFont, GetInternalFontIndex(optimumFont));
-			}
-		}
-	}
-
 	for (size_t i = 0; i < internalFonts.size(); i++) {
 		MatchQuality q = internalFonts[i]->MatchesStyle(*requestedStyle);
 		if (q != MATCH_NONE) {

GPU/GPUCommon.cpp

@@ -408,11 +408,7 @@ u32 GPUCommon::EnqueueList(u32 listpc, u32 stall, int subIntrBase, PSPPointer<Ps
 			// Lists that haven't started executing yet are free to share a stack.
 			if (stackAddr != 0 && other.stackAddr == stackAddr && other.started) {
 				ERROR_LOG(Log::G3D, "sceGeListEnqueue: can't enqueue, stack address %08X already used", stackAddr);
-				// TODO: Metal Gear Acid 2 (#10906) was probably hitting the not-started case above, which used to
-				// fail too. If it's fine without this flag now, the flag should go.
-				if (!PSP_CoreParameter().compat.flags().IgnoreEnqueue) {
-					return 0x80000021;
-				}
+				return 0x80000021;
 			}
 		}
 	}

assets/compat.ini

@@ -1847,10 +1847,6 @@ UCJS10102 = true
 NPJG00035 = true
 NPJG90068 = true  # demo
 
-[Fontltn12Hack]
-# optimumFont do not return ltn12.pgf see #11055
-NPJH00052  = true
-
 [LoadCLUTFromCurrentFrameOnly]
 # Helps Syphon Filter: Logan's Shadow color issue, # where we accidentally load a CLUT from an outdated framebuffer.
 # Perhaps this should be the default.
@@ -2004,15 +2000,6 @@ UCJS18048 = true
 UCES01421 = true
 UCJS18059 = true
 
-[IgnoreEnqueue]
-#Metal Gear Acid 2 Special Card Videos Can Crash PPSSPP Issue #10906
-ULUS10077 = true
-ULAS42035 = true
-ULES00284 = true
-ULJM05047 = true
-ULKS46065 = true
-ULJM08011 = true
-
 [MsgDialogAutoStatus]
 # Ghost Recon - Predator. See #20856
 ULUS10445 = true