summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-09-26 13:45:12 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-09-26 13:45:12 +0200
commit48bee5c8efdad46df9622e948178dd329b5f0ad3 (patch)
treeff2560c600497a8a0b3cd43dd2e0f1f094ef708a
parenteefe161549d146e4b9783269b42ec3540f498e1f (diff)
parent4fd6777cf461b1066e1a4428a746e8f8e99d4d9a (diff)
downloadredot-engine-48bee5c8efdad46df9622e948178dd329b5f0ad3.tar.gz
Merge pull request #82221 from Riteo/linux-ogl-no-vsync-override
Linux/OpenGL: Don't force vsync in the editor
-rw-r--r--drivers/egl/egl_manager.cpp6
-rw-r--r--platform/linuxbsd/x11/gl_manager_x11.cpp6
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/egl/egl_manager.cpp b/drivers/egl/egl_manager.cpp
index ac80bc8111..0faae8cf6f 100644
--- a/drivers/egl/egl_manager.cpp
+++ b/drivers/egl/egl_manager.cpp
@@ -290,12 +290,6 @@ void EGLManager::window_make_current(DisplayServer::WindowID p_window_id) {
}
void EGLManager::set_use_vsync(bool p_use) {
- // Force vsync in the editor for now, as a safety measure.
- bool is_editor = Engine::get_singleton()->is_editor_hint();
- if (is_editor) {
- p_use = true;
- }
-
// We need an active window to get a display to set the vsync.
if (!current_window) {
return;
diff --git a/platform/linuxbsd/x11/gl_manager_x11.cpp b/platform/linuxbsd/x11/gl_manager_x11.cpp
index 25c4272607..95947301cf 100644
--- a/platform/linuxbsd/x11/gl_manager_x11.cpp
+++ b/platform/linuxbsd/x11/gl_manager_x11.cpp
@@ -347,12 +347,6 @@ Error GLManager_X11::initialize(Display *p_display) {
}
void GLManager_X11::set_use_vsync(bool p_use) {
- // force vsync in the editor for now, as a safety measure
- bool is_editor = Engine::get_singleton()->is_editor_hint();
- if (is_editor) {
- p_use = true;
- }
-
// we need an active window to get a display to set the vsync
if (!_current_window) {
return;