diff options
| author | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-07-10 01:02:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-10 01:02:23 +0200 |
| commit | a2d5f191d8d91f241a09233586da0f7e9deb8a76 (patch) | |
| tree | 0ecf6d68975c6816d1cee621fc6e56d34b110467 /core | |
| parent | 0ee235822d97a4b2a1586b5fd1c092e9f53d2fff (diff) | |
| parent | 043ae9156086a2fc9fdb520539411123256b3aeb (diff) | |
Merge pull request #48622 from Geometror/reimplement-disableable-vsync
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/project_settings.cpp | 1 | ||||
| -rw-r--r-- | core/os/os.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 25506e8db3..29f53482fa 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1114,6 +1114,7 @@ ProjectSettings::ProjectSettings() { // Keep the enum values in sync with the `DisplayServer::ScreenOrientation` enum. custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::INT, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "Landscape,Portrait,Reverse Landscape,Reverse Portrait,Sensor Landscape,Sensor Portrait,Sensor"); + custom_prop_info["display/window/vsync/vsync_mode"] = PropertyInfo(Variant::STRING, "display/window/vsync/vsync_mode", PROPERTY_HINT_ENUM, "Disabled,Enabled,Adaptive,Mailbox"); custom_prop_info["rendering/driver/threads/thread_model"] = PropertyInfo(Variant::INT, "rendering/driver/threads/thread_model", PROPERTY_HINT_ENUM, "Single-Unsafe,Single-Safe,Multi-Threaded"); GLOBAL_DEF("physics/2d/run_on_thread", false); GLOBAL_DEF("physics/3d/run_on_thread", false); diff --git a/core/os/os.h b/core/os/os.h index 444f67431f..301718a8b3 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -58,8 +58,6 @@ class OS { int _orientation; bool _allow_hidpi = false; bool _allow_layered = false; - bool _use_vsync; - bool _vsync_via_compositor; bool _stdout_enabled = true; bool _stderr_enabled = true; |