diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp index bd9b0892e4..47d84b51c3 100644 --- a/Core/Compatibility.cpp +++ b/Core/Compatibility.cpp @@ -170,6 +170,7 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) { CheckSetting(iniFile, gameID, "ReadbackShadow", &flags_.ReadbackShadow); CheckSetting(iniFile, gameID, "ColorPickingDrawSyncReadback", &flags_.ColorPickingDrawSyncReadback); CheckSetting(iniFile, gameID, "FixedFramebuffer", &flags_.FixedFramebuffer); + CheckSetting(iniFile, gameID, "NativeResolutionFramebuffer", &flags_.NativeResolutionFramebuffer); } void Compatibility::CheckVRSettings(IniFile &iniFile, const std::string &gameID) { @@ -249,6 +250,25 @@ void Compatibility::CheckSetting(IniFile &iniFile, const std::string &gameID, co activeList_ += std::string(option) + ": " + text; } +void Compatibility::CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, uint32_t *address) { + std::string text; + Section *section = iniFile.GetSection(option); + if (ignored_.find(option) != ignored_.end() || !section || !section->Get(gameID.c_str(), &text)) { + return; + } + uint32_t parsed; + if (sscanf(text.c_str(), "%x", &parsed) != 1) { + WARN_LOG(Log::Loader, "compat.ini: [%s] %s is not an address: '%s'", option, gameID.c_str(), text.c_str()); + return; + } + *address = parsed & 0x041FFFFF; + + if (!activeList_.empty()) { + activeList_ += "\n"; + } + activeList_ += std::string(option) + ": " + text; +} + void Compatibility::CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, int *flag) { std::string value; Section *section = iniFile.GetSection(option); diff --git a/Core/Compatibility.h b/Core/Compatibility.h index 61c5032a63..acdb99741a 100644 --- a/Core/Compatibility.h +++ b/Core/Compatibility.h @@ -136,6 +136,7 @@ struct CompatFlags { bool ReadbackShadow; bool ColorPickingDrawSyncReadback; CompatFramebuffer FixedFramebuffer; + uint32_t NativeResolutionFramebuffer; }; struct VRCompat { @@ -178,6 +179,8 @@ private: void CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, float *value); void CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, int *value); void CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, CompatFramebuffer *value); + // A VRAM address, in hex. + void CheckSetting(IniFile &iniFile, const std::string &gameID, const char *option, uint32_t *address); CompatFlags flags_{}; VRCompat vrCompat_{}; diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp index b27b0c84be..9013b70816 100644 --- a/GPU/Common/FramebufferManagerCommon.cpp +++ b/GPU/Common/FramebufferManagerCommon.cpp @@ -1995,6 +1995,11 @@ void FramebufferManagerCommon::ResizeFramebufFBO(VirtualFramebuffer *vfb, int w, if (PSP_CoreParameter().compat.flags().Force04154000Download && vfb->fb_address == 0x04154000) { force1x = true; } + // compat.ini's NativeResolutionFramebuffer, which holds data read back texel by texel. + const u32 nativeResAddress = PSP_CoreParameter().compat.flags().NativeResolutionFramebuffer; + if (nativeResAddress != 0 && vfb->fb_address == nativeResAddress) { + force1x = true; + } if (force1x && g_Config.iInternalResolution != 1) { vfb->renderScaleFactor = 1; diff --git a/assets/compat.ini b/assets/compat.ini index 87206f616d..80368473eb 100644 --- a/assets/compat.ini +++ b/assets/compat.ini @@ -2259,3 +2259,8 @@ NPJH50186 = true # written outside where it's drawn. Created whole, initialized from memory, and uploaded without filtering. # The PS1 emulator's VRAM is a 1024x512 16-bit surface it copies between and reads back from the CPU. POPS00000 = 0x04000000,1024,512 + +[NativeResolutionFramebuffer] +# A framebuffer kept at 1x whatever the render resolution (an address in hex), for one that holds data read +# back texel by texel. The PS1 emulator unpacks 24-bit video into one three bytes per pixel. +POPS00000 = 0x04100000