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

(macOS) Added a Monterey VSync bug workaround.

Browse source
This commit is contained in:
Leon Styhre 2021-11-12 19:49:24 +01:00
parent 043db7e05e
commit 1005dfcdb7
3 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
es-app/src/guis/GuiMenu.cpp
View file

@ -965,7 +965,7 @@ void GuiMenu::openOtherOptions()
}); });
#if defined(_WIN64) #if defined(_WIN64)
// Hide taskbar during the ES program session. // Hide taskbar during the program session.
auto hide_taskbar = std::make_shared<SwitchComponent>(mWindow); auto hide_taskbar = std::make_shared<SwitchComponent>(mWindow);
hide_taskbar->setState(Settings::getInstance()->getBool("HideTaskbar")); hide_taskbar->setState(Settings::getInstance()->getBool("HideTaskbar"));
s->addWithLabel("HIDE TASKBAR (REQUIRES RESTART)", hide_taskbar); s->addWithLabel("HIDE TASKBAR (REQUIRES RESTART)", hide_taskbar);
@ -977,6 +977,19 @@ void GuiMenu::openOtherOptions()
}); });
#endif #endif
#if defined(__APPLE__)
// macOS Monterey VSync bug workaround (hack for broken OpenGL drivers).
auto vsyncWorkaround = std::make_shared<SwitchComponent>(mWindow);
vsyncWorkaround->setState(Settings::getInstance()->getBool("VSyncWorkaround"));
s->addWithLabel("MACOS MONTEREY VSYNC BUG WORKAROUND", vsyncWorkaround);
s->addSaveFunc([vsyncWorkaround, s] {
if (vsyncWorkaround->getState() != Settings::getInstance()->getBool("VSyncWorkaround")) {
Settings::getInstance()->setBool("VSyncWorkaround", vsyncWorkaround->getState());
s->setNeedsSaving();
}
});
#endif
// Run ES in the background when a game has been launched. // Run ES in the background when a game has been launched.
auto run_in_background = std::make_shared<SwitchComponent>(mWindow); auto run_in_background = std::make_shared<SwitchComponent>(mWindow);
run_in_background->setState(Settings::getInstance()->getBool("RunInBackground")); run_in_background->setState(Settings::getInstance()->getBool("RunInBackground"));

3
es-core/src/Settings.cpp
View file

@ -244,6 +244,9 @@ void Settings::setDefaults()
mStringMap["SaveGamelistsMode"] = {"always", "always"}; mStringMap["SaveGamelistsMode"] = {"always", "always"};
#if defined(_WIN64) #if defined(_WIN64)
mBoolMap["HideTaskbar"] = {false, false}; mBoolMap["HideTaskbar"] = {false, false};
#endif
#if defined(__APPLE__)
mBoolMap["VSyncWorkaround"] = {false, false};
#endif #endif
mBoolMap["RunInBackground"] = {false, false}; mBoolMap["RunInBackground"] = {false, false};
#if defined(_WIN64) #if defined(_WIN64)

27
es-core/src/renderers/Renderer_GL21.cpp
View file

@ -12,6 +12,10 @@
#include "Shader_GL21.h" #include "Shader_GL21.h"
#include "renderers/Renderer.h" #include "renderers/Renderer.h"
#if defined(__APPLE__)
#include <chrono>
#endif
namespace Renderer namespace Renderer
{ {
static SDL_GLContext sdlContext = nullptr; static SDL_GLContext sdlContext = nullptr;
@ -410,7 +414,30 @@ namespace Renderer
void swapBuffers() void swapBuffers()
{ {
#if defined(__APPLE__)
// This is an ugly hack to work around an OpenGL VSync bug introduced in macOS 12 Monterey.
// What happens is that the VSync setting in SDL gets effectively ignored so the operating
// system will try to render as many frames as it can manage which eats all the available
// resources. If the corresponding setting is enabled via the main menu, a 10 millisecond
// delay will be introduced if the swap took less than 3 milliseconds to complete. This is
// very crude and not accurate at all but it will hopefully avoid the worst slowdowns until
// Apple releases an OS update that properly fixes the problem.
if (Settings::getInstance()->getBool("VSyncWorkaround")) {
const auto beforeSwap = std::chrono::system_clock::now();
SDL_GL_SwapWindow(getSDLWindow());
const auto afterSwap = std::chrono::system_clock::now();
if (std::chrono::duration_cast<std::chrono::milliseconds>(afterSwap - beforeSwap)
.count() < 3.0)
SDL_Delay(10);
}
else {
SDL_GL_SwapWindow(getSDLWindow());
}
#else
SDL_GL_SwapWindow(getSDLWindow()); SDL_GL_SwapWindow(getSDLWindow());
#endif
GL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)); GL_CHECK_ERROR(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
} }