diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp index 0f80b9c593..1e83eddc83 100644 --- a/Core/Compatibility.cpp +++ b/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); diff --git a/Core/Compatibility.h b/Core/Compatibility.h index e7f1220d33..f39d40e5f0 100644 --- a/Core/Compatibility.h +++ b/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; diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index 0c83bb0d45..a2151d8b94 100644 --- a/Core/HLE/sceFont.cpp +++ b/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::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) { diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index e8e3c95b3a..9a3e434ea7 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -408,11 +408,7 @@ u32 GPUCommon::EnqueueList(u32 listpc, u32 stall, int subIntrBase, PSPPointer