preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19250 from sonninnos/libretro

Browse Source 
Libretro: More maintenance
This commit is contained in:
Henrik Rydgård
2024-06-05 20:46:50 +02:00
committed by GitHub
parent ff48de1636 4c1b50a394
commit f51870f78d
2 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libretro/LibretroGraphicsContext.cpp
+8
View File
@@ -42,6 +42,10 @@ LibretroHWRenderContext::LibretroHWRenderContext(retro_hw_context_type context_t
void LibretroHWRenderContext::ContextReset() {
INFO_LOG(G3D, "Context reset");
if (gpu && Libretro::useEmuThread) {
Libretro::EmuThreadPause();
}
if (gpu) {
gpu->DeviceLost();
}
@@ -57,6 +61,10 @@ void LibretroHWRenderContext::ContextReset() {
if (gpu) {
gpu->DeviceRestore(draw_);
}
if (gpu && Libretro::useEmuThread) {
Libretro::EmuThreadStart();
}
}
void LibretroHWRenderContext::ContextDestroy() {
libretro/libretro.cpp
+31 -24
View File
@@ -487,9 +487,12 @@ static std::string map_psp_language_to_i18n_locale(int val)
static void check_variables(CoreParameter &coreParam)
{
bool isFastForwarding;
if (environ_cb(RETRO_ENVIRONMENT_GET_FASTFORWARDING, &isFastForwarding))
coreParam.fastForward = isFastForwarding;
if (g_Config.bForceLagSync)
{
bool isFastForwarding;
if (environ_cb(RETRO_ENVIRONMENT_GET_FASTFORWARDING, &isFastForwarding))
coreParam.fastForward = isFastForwarding;
}
bool updated = false;
@@ -1192,9 +1195,20 @@ static const struct retro_controller_info ports[] =
void retro_init(void)
{
VsyncSwapIntervalReset();
struct retro_log_callback log;
if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log))
{
log_cb = log.log;
LogManager::Init(&g_Config.bEnableLogging);
printfLogger = new PrintfLogger(log);
LogManager* logman = LogManager::GetInstance();
logman->RemoveListener(logman->GetConsoleListener());
logman->RemoveListener(logman->GetDebuggerListener());
logman->ChangeFileLog(nullptr);
logman->AddListener(printfLogger);
}
g_threadManager.Init(cpu_info.num_cores, cpu_info.logical_cpu_count);
VsyncSwapIntervalReset();
struct retro_input_descriptor desc[] = {
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" },
@@ -1221,23 +1235,12 @@ void retro_init(void)
if (environ_cb(RETRO_ENVIRONMENT_GET_INPUT_BITMASKS, NULL))
libretro_supports_bitmasks = true;
struct retro_log_callback log;
if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log))
{
log_cb = log.log;
LogManager::Init(&g_Config.bEnableLogging);
printfLogger = new PrintfLogger(log);
LogManager* logman = LogManager::GetInstance();
logman->RemoveListener(logman->GetConsoleListener());
logman->RemoveListener(logman->GetDebuggerListener());
logman->ChangeFileLog(nullptr);
logman->AddListener(printfLogger);
logman->SetAllLogLevels(LogLevel::LINFO);
}
g_Config.Load("", "");
g_Config.iInternalResolution = 0;
// Log levels must be set after g_Config.Load
LogManager::GetInstance()->SetAllLogLevels(LogLevel::LINFO);
const char* nickname = NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_USERNAME, &nickname) && nickname)
g_Config.sNickName = std::string(nickname);
@@ -1263,6 +1266,8 @@ void retro_init(void)
g_VFS.Register("", new DirectoryReader(retro_base_dir));
g_threadManager.Init(cpu_info.num_cores, cpu_info.logical_cpu_count);
init_output_audio_buffer(2048);
}
@@ -1270,6 +1275,7 @@ void retro_deinit(void)
{
g_threadManager.Teardown();
LogManager::Shutdown();
log_cb = NULL;
delete printfLogger;
printfLogger = nullptr;
@@ -1652,7 +1658,7 @@ void retro_run(void)
if (useEmuThread)
{
if( emuThreadState == EmuThreadState::PAUSED ||
if ( emuThreadState == EmuThreadState::PAUSED ||
emuThreadState == EmuThreadState::PAUSE_REQUESTED)
{
VsyncSwapIntervalDetect();
@@ -1691,9 +1697,8 @@ namespace SaveState
size_t retro_serialize_size(void)
{
if(!gpu) { // The HW renderer isn't ready on first pass.
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
@@ -1706,9 +1711,8 @@ size_t retro_serialize_size(void)
bool retro_serialize(void *data, size_t size)
{
if(!gpu) { // The HW renderer isn't ready on first pass.
if (!gpu) // The HW renderer isn't ready on first pass.
return false;
}
// TODO: Libretro API extension to use the savestate queue
if (useEmuThread)
@@ -1730,6 +1734,9 @@ bool retro_serialize(void *data, size_t size)
bool retro_unserialize(const void *data, size_t size)
{
if (!gpu) // The HW renderer isn't ready on first pass.
return false;
// TODO: Libretro API extension to use the savestate queue
if (useEmuThread)
EmuThreadPause(); // Does nothing if already paused