Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Do not call methods on gpu if it is null. Fixes #13412 (sans video rewind). (#14674)

Browse Source 
* Do not call methods on gpu if it is null. Fixes 13412 (sans video rewind).

* Do not call methods on gpu if it is null. Fixes #13412 (sans video rewind).

* Ensure PSP is init before measuring state size.

* Continue running core until GPU is ready.

* Libretro: Bypass state measure during init.

* Sync ffmpeg version with master.

* Do not call methods on gpu if it is null. Fixes #13412 (sans video rewind).

* Ensure PSP is init before measuring state size.

* Continue running core until GPU is ready.

* Libretro: Bypass state measure during init.

* Sync ffmpeg version with master.
This commit is contained in:
Brian Blakely 2021-08-09 17:16:30 -04:00 committed by GitHub
parent 4f6ae0b322
commit 379f075c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libretro/libretro.cpp
View File

@ -252,7 +252,7 @@ void retro_set_environment(retro_environment_t cb)
vars.push_back(ppsspp_software_skinning.GetOptions());
vars.push_back(ppsspp_lazy_texture_caching.GetOptions());
vars.push_back(ppsspp_retain_changed_textures.GetOptions());
vars.push_back(ppsspp_force_lag_sync.GetOptions());
vars.push_back(ppsspp_force_lag_sync.GetOptions());
vars.push_back(ppsspp_disable_slow_framebuffer_effects.GetOptions());
vars.push_back(ppsspp_lower_resolution_for_effects.GetOptions());
vars.push_back(ppsspp_texture_scaling_level.GetOptions());
@ -343,8 +343,8 @@ static void check_variables(CoreParameter &coreParam)
{
bool updated = false;
if ( coreState != CORE_POWERUP
&& environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated)
if ( coreState != CORE_POWERUP
&& environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated)
&& !updated)
return;
@ -638,13 +638,13 @@ bool retro_load_game(const struct retro_game_info *game)
g_Config.sNickName = std::string(nickname);
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir_ptr)
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir_ptr)
&& dir_ptr)
{
retro_base_dir = Path(dir_ptr);
}
if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir_ptr)
if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir_ptr)
&& dir_ptr)
{
retro_save_dir = Path(dir_ptr);
@ -827,7 +827,7 @@ void retro_run(void)
if (useEmuThread)
{
if( emuThreadState == EmuThreadState::PAUSED ||
if( emuThreadState == EmuThreadState::PAUSED ||
emuThreadState == EmuThreadState::PAUSE_REQUESTED)
{
ctx->SwapBuffers();
@ -860,17 +860,25 @@ namespace SaveState
size_t retro_serialize_size(void)
{
if(!gpu) { // The HW renderer isn't ready on first pass.
return 134217728; // 128MB ought to be enough for anybody.
}
SaveState::SaveStart state;
// TODO: Libretro API extension to use the savestate queue
if (useEmuThread)
EmuThreadPause();
return (CChunkFileReader::MeasurePtr(state) + 0x800000)
return (CChunkFileReader::MeasurePtr(state) + 0x800000)
& ~0x7FFFFF; // We don't unpause intentionally
}
bool retro_serialize(void *data, size_t size)
{
if(!gpu) { // The HW renderer isn't ready on first pass.
return false;
}
bool retVal;
SaveState::SaveStart state;
// TODO: Libretro API extension to use the savestate queue
@ -900,7 +908,7 @@ bool retro_unserialize(const void *data, size_t size)
EmuThreadPause(); // Does nothing if already paused
std::string errorString;
retVal = CChunkFileReader::LoadPtr((u8 *)data, state, &errorString)
retVal = CChunkFileReader::LoadPtr((u8 *)data, state, &errorString)
== CChunkFileReader::ERROR_NONE;
if (useEmuThread)