Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Module: Reinit gpu only on runtime module load.

Browse source 
During initial loading, we load the module in a thread.  It's not
deterministic if the gpu will load before or after the ELF, which can
cause a crash.

There's no real reason to Reinitialize() it there, though.  We already
Reinitialize() on gpu start.
This commit is contained in:
Unknown W. Brackets 2020-03-08 15:35:21 -07:00
parent f648a82df9
commit 2e0eade993
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Core/HLE/sceKernelModule.cpp
View file

@ -1635,8 +1635,6 @@ void __KernelLoadReset() {
HLEShutdown(); HLEShutdown();
Replacement_Init(); Replacement_Init();
HLEInit(); HLEInit();
assert(gpu);
gpu->Reinitialize();
} }
__KernelModuleInit(); __KernelModuleInit();
@ -1836,6 +1834,9 @@ int sceKernelLoadExec(const char *filename, u32 paramPtr)
Core_UpdateState(CORE_ERROR); Core_UpdateState(CORE_ERROR);
return -1; return -1;
} }
if (gpu) {
gpu->Reinitialize();
}
return 0; return 0;
} }
@ -1920,6 +1921,9 @@ u32 sceKernelLoadModule(const char *name, u32 flags, u32 optionAddr) {
NOTICE_LOG_REPORT(LOADER, "Module %s is blacklisted or undecryptable - we try __KernelLoadExec", name); NOTICE_LOG_REPORT(LOADER, "Module %s is blacklisted or undecryptable - we try __KernelLoadExec", name);
// Name might get deleted. // Name might get deleted.
const std::string safeName = name; const std::string safeName = name;
if (gpu) {
gpu->Reinitialize();
}
return __KernelLoadExec(safeName.c_str(), 0, &error_string); return __KernelLoadExec(safeName.c_str(), 0, &error_string);
} else { } else {
hleLogError(LOADER, error, "failed to load"); hleLogError(LOADER, error, "failed to load");