From 8b101ae4a1fac152235d969a2e252ddbcf6cd5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 9 Feb 2021 16:11:59 +0100
Subject: [PATCH] Rename the new warmup variable from #14091
---
Core/Compatibility.cpp | 2 +-
Core/Compatibility.h | 2 +-
Core/HLE/sceMpeg.cpp | 2 +-
assets/compat.ini | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp
index ef5bdf94b3..45a5bb25bd 100644
--- a/Core/Compatibility.cpp
+++ b/Core/Compatibility.cpp
@@ -79,7 +79,7 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
CheckSetting(iniFile, gameID, "ShaderColorBitmask", &flags_.ShaderColorBitmask);
CheckSetting(iniFile, gameID, "DisableFirstFrameReadback", &flags_.DisableFirstFrameReadback);
CheckSetting(iniFile, gameID, "DisableRangeCulling", &flags_.DisableRangeCulling);
- CheckSetting(iniFile, gameID, "MpegWarmUpForGodEaterSeries", &flags_.MpegWarmUpForGodEaterSeries);
+ CheckSetting(iniFile, gameID, "MpegAvcWarmUp", &flags_.MpegAvcWarmUp);
}
void Compatibility::CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, bool *flag) {
diff --git a/Core/Compatibility.h b/Core/Compatibility.h
index 28caefd16e..da0e36c1f6 100644
--- a/Core/Compatibility.h
+++ b/Core/Compatibility.h
@@ -77,7 +77,7 @@ struct CompatFlags {
bool ShaderColorBitmask;
bool DisableFirstFrameReadback;
bool DisableRangeCulling;
- bool MpegWarmUpForGodEaterSeries;
+ bool MpegAvcWarmUp;
};
class IniFile;
diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
index 2def75bac0..b98f57d7b4 100644
--- a/Core/HLE/sceMpeg.cpp
+++ b/Core/HLE/sceMpeg.cpp
@@ -1587,7 +1587,7 @@ static int sceMpegGetAvcAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
return -1;
}
- if (PSP_CoreParameter().compat.flags().MpegWarmUpForGodEaterSeries) {
+ if (PSP_CoreParameter().compat.flags().MpegAvcWarmUp) {
if (ctx->mpegwarmUp == 0) {
DEBUG_LOG(ME, "sceMpegGetAvcAu(%08x, %08x, %08x, %08x): warming up", mpeg, streamId, auAddr, attrAddr);
ctx->mpegwarmUp++;
diff --git a/assets/compat.ini b/assets/compat.ini
index fdf86ff912..431398a2a6 100644
--- a/assets/compat.ini
+++ b/assets/compat.ini
@@ -989,7 +989,7 @@ UCES00001 = true
UCKS45008 = true
NPJG00059 = true
-[MpegWarmUpForGodEaterSeries]
+[MpegAvcWarmUp]
# God Eater issue #13527 ,It is custom mpeg library that required sceMpegGetAvcAu return ERROR_MPEG_NO_DATA but break FIFA 14 issue #14086
# God Eater 1
ULJS00237 = true