OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-15 17:10:06 +00:00
Code Issues Projects Releases Wiki Activity

Frontend: Don't call DoneCurrent if the context isnt already current

Browse Source
This commit is contained in:
James Rowe 2020-03-30 14:52:46 -06:00
parent cf9c94d401
commit f1da3ec584
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/yuzu/bootmanager.cpp
View File

@ -141,7 +141,7 @@ public:
} }
~OpenGLSharedContext() { ~OpenGLSharedContext() {
context->doneCurrent(); DoneCurrent();
} }
void SwapBuffers() override { void SwapBuffers() override {
@ -156,6 +156,9 @@ public:
} }
void DoneCurrent() override { void DoneCurrent() override {
if (!is_current) {
return;
}
context->doneCurrent(); context->doneCurrent();
is_current = false; is_current = false;
} }

10
src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
View File

@ -37,16 +37,24 @@ public:
} }
void MakeCurrent() override { void MakeCurrent() override {
SDL_GL_MakeCurrent(window, context); if (is_current) {
return;
}
is_current = SDL_GL_MakeCurrent(window, context) == 0;
} }
void DoneCurrent() override { void DoneCurrent() override {
if (!is_current) {
return;
}
SDL_GL_MakeCurrent(window, nullptr); SDL_GL_MakeCurrent(window, nullptr);
is_current = false;
} }
private: private:
SDL_Window* window; SDL_Window* window;
SDL_GLContext context; SDL_GLContext context;
bool is_current = false;
}; };
bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() { bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() {