Merge pull request #20468 from hrydgard/dragons-lair-workaround

hrydgard · web-flow · commit 61016b8555d3 · 2025-06-07T15:58:02.000+02:00
Add workaround for scePsmf LLE not working with Dragon's Lair
diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp
@@ -150,6 +150,7 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
 	CheckSetting(iniFile, gameID, "UseFFMPEGFindStreamInfo", &flags_.UseFFMPEGFindStreamInfo);
 	CheckSetting(iniFile, gameID, "SoftwareRasterDepth", &flags_.SoftwareRasterDepth);
 	CheckSetting(iniFile, gameID, "DisableHLESceFont", &flags_.DisableHLESceFont);
+	CheckSetting(iniFile, gameID, "ForceHLEPsmf", &flags_.ForceHLEPsmf);
 }
 
 void Compatibility::CheckVRSettings(IniFile &iniFile, const std::string &gameID) {
diff --git a/Core/Compatibility.h b/Core/Compatibility.h
@@ -113,6 +113,7 @@ struct CompatFlags {
 	bool UseFFMPEGFindStreamInfo;
 	bool SoftwareRasterDepth;
 	bool DisableHLESceFont;
+	bool ForceHLEPsmf;
 };
 
 struct VRCompat {
diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
@@ -202,6 +202,9 @@ static DisableHLEFlags GetDisableHLEFlags() {
 	if (PSP_CoreParameter().compat.flags().DisableHLESceFont) {
 		flags |= DisableHLEFlags::sceFont;
 	}
+	if (PSP_CoreParameter().compat.flags().ForceHLEPsmf) {
+		flags &= ~(DisableHLEFlags::scePsmf | DisableHLEFlags::scePsmfPlayer);
+	}
 
 	flags &= ~(DisableHLEFlags)g_Config.iForceEnableHLE;
 	return flags;
diff --git a/assets/compat.ini b/assets/compat.ini
@@ -1923,3 +1923,8 @@ UCKS45164 = true
 UCES01184 = true
 UCUS98668 = true
 UCJP00174 = true
+
+[ForceHLEPsmf]
+# See issue #20467
+NPUH10105 = true
+NPEH00122 = true

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {`
`150`	`150`	`CheckSetting(iniFile, gameID, "UseFFMPEGFindStreamInfo", &flags_.UseFFMPEGFindStreamInfo);`
`151`	`151`	`CheckSetting(iniFile, gameID, "SoftwareRasterDepth", &flags_.SoftwareRasterDepth);`
`152`	`152`	`CheckSetting(iniFile, gameID, "DisableHLESceFont", &flags_.DisableHLESceFont);`
	`153`	`+ CheckSetting(iniFile, gameID, "ForceHLEPsmf", &flags_.ForceHLEPsmf);`
`153`	`154`	`}`
`154`	`155`
`155`	`156`	`void Compatibility::CheckVRSettings(IniFile &iniFile, const std::string &gameID) {`
Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,9 @@ static DisableHLEFlags GetDisableHLEFlags() {`
`202`	`202`	`if (PSP_CoreParameter().compat.flags().DisableHLESceFont) {`
`203`	`203`	`flags \|= DisableHLEFlags::sceFont;`
`204`	`204`	`}`
	`205`	`+ if (PSP_CoreParameter().compat.flags().ForceHLEPsmf) {`
	`206`	`+ flags &= ~(DisableHLEFlags::scePsmf \| DisableHLEFlags::scePsmfPlayer);`
	`207`	`+ }`
`205`	`208`
`206`	`209`	`flags &= ~(DisableHLEFlags)g_Config.iForceEnableHLE;`
`207`	`210`	`return flags;`