starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-07-08 17:46:19 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

OpenGLDevice: Fix incorrect SDL MakeCurrent()/DoneCurrent() usage

Browse Source 
Too bad multiple windows on a single aren't supported properly.

Should just rip this whole thing out.
This commit is contained in:
Stenzek
2026-02-16 22:42:30 +10:00
parent 6a4ae21f33
commit 9f94d6b0a0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/opengl_context_sdl.cpp
View File

@@ -124,7 +124,10 @@ OpenGLContext::SurfaceHandle OpenGLContextSDL::CreateSurface(WindowInfo& wi, Err
void OpenGLContextSDL::DestroySurface(SurfaceHandle handle)
{
// cleaned up on window destruction?
// cleaned up on window destruction? but we still need to clear current
SDL_Window* const window = static_cast<SDL_Window*>(handle);
if (m_current_window == window)
DoneCurrent();
}
void OpenGLContextSDL::ResizeSurface(WindowInfo& wi, SurfaceHandle handle)
@@ -159,7 +162,7 @@ bool OpenGLContextSDL::MakeCurrent(SurfaceHandle surface, Error* error /* = null
if (m_current_window == window)
return true;
if (SDL_GL_MakeCurrent(window, m_context) != 0)
if (!SDL_GL_MakeCurrent(window, m_context))
{
ERROR_LOG("SDL_GL_MakeCurrent() failed: {}", SDL_GetError());
return false;
@@ -171,7 +174,7 @@ bool OpenGLContextSDL::MakeCurrent(SurfaceHandle surface, Error* error /* = null
bool OpenGLContextSDL::DoneCurrent()
{
if (SDL_GL_MakeCurrent(nullptr, nullptr) != 0)
if (!SDL_GL_MakeCurrent(nullptr, nullptr))
return false;
m_current_window = nullptr;