Skip to content

Vsync control support for non-win32 platform #7821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhykzhykzhyk wants to merge 3 commits into from
Closed

Vsync control support for non-win32 platform #7821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2fb87f
Move throttling code from Core_RunLoop to UpdateRunLoop.
zhykzhykzhyk Jun 23, 2015
43a81f6
Make vsync works on non-win32 platforms.
zhykzhykzhyk Jun 23, 2015
3c9d924
Add PSP_IsInited() to throttling condition
zhykzhykzhyk Jun 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions Core/Core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ bool UpdateScreenScale(int width, int height, bool smallWindow) {
}

void UpdateRunLoop() {
time_update();
double startTime = time_now_d();

if (windowHidden && g_Config.bPauseWhenMinimized) {
sleep_ms(16);
return;
Expand All @@ -167,6 +170,16 @@ void UpdateRunLoop() {
if (GetUIState() != UISTATE_EXIT) {
NativeRender();
}

if (GetUIState() != UISTATE_INGAME || !PSP_IsInited()) {
// Simple throttling to not burn the GPU in the menu.
time_update();
double diffTime = time_now_d() - startTime;
int sleepTime = (int)(1000.0 / 60.0) - (int)(diffTime * 1000.0);

if (sleepTime > 0)
sleep_ms(sleepTime);
}
}

#if defined(USING_WIN_UI)
Expand All @@ -186,27 +199,15 @@ void GPU_SwapBuffers() {

void Core_RunLoop() {
while ((GetUIState() != UISTATE_INGAME || !PSP_IsInited()) && GetUIState() != UISTATE_EXIT) {
time_update();
#if defined(USING_WIN_UI)
double startTime = time_now_d();
UpdateRunLoop();

// Simple throttling to not burn the GPU in the menu.
time_update();
double diffTime = time_now_d() - startTime;
int sleepTime = (int)(1000.0 / 60.0) - (int)(diffTime * 1000.0);
if (sleepTime > 0)
Sleep(sleepTime);
#if defined(USING_WIN_UI)
if (!windowHidden) {
GPU_SwapBuffers();
}
#else
UpdateRunLoop();
#endif
}

while (!coreState && GetUIState() == UISTATE_INGAME) {
time_update();
UpdateRunLoop();
#if defined(USING_WIN_UI)
if (!windowHidden && !Core_IsStepping()) {
Expand Down
2 changes: 1 addition & 1 deletion GPU/GLES/GLES_GPU.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ void GLES_GPU::BeginFrame() {
}

inline void GLES_GPU::UpdateVsyncInterval(bool force) {
#ifdef _WIN32
#ifndef USING_GLES2
int desiredVSyncInterval = g_Config.bVSync ? 1 : 0;
if (PSP_CoreParameter().unthrottle) {
desiredVSyncInterval = 0;
Expand Down
2 changes: 1 addition & 1 deletion UI/GameSettingsScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void GameSettingsScreen::CreateViews() {
hwscale->OnChoice.Handle(this, &GameSettingsScreen::OnHwScaleChange); // To refresh the display mode
#endif

#ifdef _WIN32
#ifndef USING_GLES2
graphicsSettings->Add(new CheckBox(&g_Config.bVSync, gs->T("VSync")));
#endif
CheckBox *mipmapping = graphicsSettings->Add(new CheckBox(&g_Config.bMipMap, gs->T("Mipmapping")));
Expand Down