Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-03-06 14:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenGLHostDisplay: Set swap interval on emu thread

Browse source 
Fixes vsync being locked on in Linux.
This commit is contained in:
Connor McLaughlin 2022-12-07 12:37:55 +10:00
parent 84c966502d
commit 9d23df3aba
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/frontend-common/opengl_host_display.cpp
View file

@ -212,16 +212,11 @@ bool OpenGLHostDisplay::SupportsTextureFormat(GPUTexture::Format format) const
void OpenGLHostDisplay::SetVSync(bool enabled) void OpenGLHostDisplay::SetVSync(bool enabled)
{ {
if (m_vsync_enabled == enabled || m_gl_context->GetWindowInfo().type == WindowInfo::Type::Surfaceless) if (m_vsync_enabled == enabled)
return; return;
// Window framebuffer has to be bound to call SetSwapInterval.
GLint current_fbo = 0;
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &current_fbo);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
m_gl_context->SetSwapInterval(enabled ? 1 : 0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, current_fbo);
m_vsync_enabled = enabled; m_vsync_enabled = enabled;
SetSwapInterval();
} }
const char* OpenGLHostDisplay::GetGLSLVersionString() const const char* OpenGLHostDisplay::GetGLSLVersionString() const
@ -296,7 +291,7 @@ bool OpenGLHostDisplay::CreateDevice(const WindowInfo& wi, bool vsync)
} }
m_window_info = m_gl_context->GetWindowInfo(); m_window_info = m_gl_context->GetWindowInfo();
SetVSync(vsync); m_vsync_enabled = vsync;
return true; return true;
} }
@ -333,6 +328,7 @@ bool OpenGLHostDisplay::SetupDevice()
if (!CreateResources()) if (!CreateResources())
return false; return false;
SetSwapInterval();
return true; return true;
} }
@ -363,6 +359,9 @@ bool OpenGLHostDisplay::ChangeWindow(const WindowInfo& new_wi)
} }
m_window_info = m_gl_context->GetWindowInfo(); m_window_info = m_gl_context->GetWindowInfo();
// Update swap interval for new surface.
SetSwapInterval();
return true; return true;
} }
@ -375,6 +374,23 @@ void OpenGLHostDisplay::ResizeWindow(s32 new_window_width, s32 new_window_height
m_window_info = m_gl_context->GetWindowInfo(); m_window_info = m_gl_context->GetWindowInfo();
} }
void OpenGLHostDisplay::SetSwapInterval()
{
if (m_window_info.type == WindowInfo::Type::Surfaceless)
return;
// Window framebuffer has to be bound to call SetSwapInterval.
const s32 interval = m_vsync_enabled ? 1 : 0;
GLint current_fbo = 0;
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &current_fbo);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
if (!m_gl_context->SetSwapInterval(interval))
Log_WarningPrintf("Failed to set swap interval to %d", interval);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, current_fbo);
}
bool OpenGLHostDisplay::SupportsFullscreen() const bool OpenGLHostDisplay::SupportsFullscreen() const
{ {
return false; return false;

2
src/frontend-common/opengl_host_display.h
View file

@ -81,6 +81,8 @@ protected:
void DestroyImGuiContext() override; void DestroyImGuiContext() override;
bool UpdateImGuiFontTexture() override; bool UpdateImGuiFontTexture() override;
void SetSwapInterval();
void RenderDisplay(); void RenderDisplay();
void RenderImGui(); void RenderImGui();
void RenderSoftwareCursor(); void RenderSoftwareCursor();