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

Core.cpp: Some slight simplifications

Browse Source
This commit is contained in:
Henrik Rydgård 2023-08-10 16:33:02 +02:00
parent 0deefb82a9
commit 0477ba8c78
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Core/Core.cpp
View File

@ -59,14 +59,12 @@ static uint32_t steppingAddress = 0;
static std::set<CoreLifecycleFunc> lifecycleFuncs;
static std::set<CoreStopRequestFunc> stopFuncs;
static bool windowHidden = false;
static GraphicsContext *graphicsContext;
static bool powerSaving = false;
static MIPSExceptionInfo g_exceptionInfo;
void Core_SetGraphicsContext(GraphicsContext *ctx) {
graphicsContext = ctx;
PSP_CoreParameter().graphicsContext = graphicsContext;
PSP_CoreParameter().graphicsContext = ctx;
}
void Core_NotifyWindowHidden(bool hidden) {
@ -198,24 +196,28 @@ bool UpdateScreenScale(int width, int height) {
return false;
}
// Note: not used on Android.
void UpdateRunLoop() {
// Used by Windows, SDL, Qt.
void UpdateRunLoop(GraphicsContext *ctx) {
NativeFrame(ctx);
if (windowHidden && g_Config.bPauseWhenMinimized) {
sleep_ms(16);
return;
}
NativeFrame(graphicsContext);
}
// Note: not used on Android.
void Core_RunLoop(GraphicsContext *ctx) {
float refreshRate = System_GetPropertyFloat(SYSPROP_DISPLAY_REFRESH_RATE);
graphicsContext = ctx;
while ((GetUIState() != UISTATE_INGAME || !PSP_IsInited()) && GetUIState() != UISTATE_EXIT) {
// In case it was pending, we're not in game anymore. We won't get to Core_Run().
Core_StateProcessed();
if (windowHidden && g_Config.bPauseWhenMinimized) {
sleep_ms(16);
return;
}
if ((GetUIState() != UISTATE_INGAME || !PSP_IsInited()) && GetUIState() != UISTATE_EXIT) {
// In case it was pending, we're not in game anymore.
double startTime = time_now_d();
UpdateRunLoop();
NativeFrame(ctx);
// Simple throttling to not burn the GPU in the menu.
double diffTime = time_now_d() - startTime;
@ -227,8 +229,8 @@ void Core_RunLoop(GraphicsContext *ctx) {
}
}
while ((coreState == CORE_RUNNING || coreState == CORE_STEPPING) && GetUIState() == UISTATE_INGAME) {
UpdateRunLoop();
if ((coreState == CORE_RUNNING || coreState == CORE_STEPPING) && GetUIState() == UISTATE_INGAME) {
NativeFrame(ctx);
if (!windowHidden && !Core_IsStepping()) {
ctx->SwapBuffers();
}
@ -308,7 +310,8 @@ bool Core_Run(GraphicsContext *ctx) {
if (GetUIState() != UISTATE_INGAME) {
Core_StateProcessed();
if (GetUIState() == UISTATE_EXIT) {
UpdateRunLoop();
// Not sure why we do a final frame here?
NativeFrame(ctx);
return false;
}
Core_RunLoop(ctx);
@ -318,6 +321,7 @@ bool Core_Run(GraphicsContext *ctx) {
switch (coreState) {
case CORE_RUNNING:
case CORE_STEPPING:
Core_StateProcessed();
// enter a fast runloop
Core_RunLoop(ctx);
if (coreState == CORE_POWERDOWN) {
@ -332,7 +336,6 @@ bool Core_Run(GraphicsContext *ctx) {
case CORE_RUNTIME_ERROR:
// Exit loop!!
Core_StateProcessed();
return true;
case CORE_NEXTFRAME:

2
Core/Core.h
View File

@ -25,7 +25,7 @@
class GraphicsContext;
// called from emu thread
void UpdateRunLoop();
void UpdateRunLoop(GraphicsContext *ctx);
// Returns false when an UI exit state is detected.
bool Core_Run(GraphicsContext *ctx);

4
Qt/QtMain.cpp
View File

@ -475,7 +475,7 @@ void MainUI::EmuThreadFunc() {
emuThreadState = (int)EmuThreadState::RUNNING;
while (emuThreadState != (int)EmuThreadState::QUIT_REQUESTED) {
updateAccelerometer();
UpdateRunLoop();
UpdateRunLoop(graphicsContext);
}
emuThreadState = (int)EmuThreadState::STOPPED;
@ -719,7 +719,7 @@ void MainUI::paintGL() {
#endif
updateAccelerometer();
if (emuThreadState == (int)EmuThreadState::DISABLED) {
UpdateRunLoop();
UpdateRunLoop(graphicsContext);
} else {
graphicsContext->ThreadFrame();
// Do the rest in EmuThreadFunc

4
SDL/SDLMain.cpp
View File

@ -656,7 +656,7 @@ static void EmuThreadFunc(GraphicsContext *graphicsContext) {
NativeInitGraphics(graphicsContext);
while (emuThreadState != (int)EmuThreadState::QUIT_REQUESTED) {
UpdateRunLoop();
UpdateRunLoop(graphicsContext);
}
emuThreadState = (int)EmuThreadState::STOPPED;
graphicsContext->StopThread();
@ -1428,7 +1428,7 @@ int main(int argc, char *argv[]) {
break;
const uint8_t *keys = SDL_GetKeyboardState(NULL);
if (emuThreadState == (int)EmuThreadState::DISABLED) {
UpdateRunLoop();
UpdateRunLoop(graphicsContext);
}
if (g_QuitRequested || g_RestartRequested)
break;

2
android/jni/app-android.cpp
View File

@ -1517,8 +1517,6 @@ extern "C" bool JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runVulkanRenderLoo
while (!exitRenderLoop) {
LockedNativeUpdateRender();
graphicsContext->SwapBuffers();
ProcessFrameCommands(env);
}