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 /servers/rendering | |
| parent | 0ee235822d97a4b2a1586b5fd1c092e9f53d2fff (diff) | |
| parent | 043ae9156086a2fc9fdb520539411123256b3aeb (diff) | |
Merge pull request #48622 from Geometror/reimplement-disableable-vsync
Diffstat (limited to 'servers/rendering')
| -rw-r--r-- | servers/rendering/renderer_viewport.cpp | 6 | ||||
| -rw-r--r-- | servers/rendering/renderer_viewport.h | 4 | ||||
| -rw-r--r-- | servers/rendering/rendering_server_default.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/servers/rendering/renderer_viewport.cpp b/servers/rendering/renderer_viewport.cpp index 46e340c0ac..f651fbfa75 100644 --- a/servers/rendering/renderer_viewport.cpp +++ b/servers/rendering/renderer_viewport.cpp @@ -1116,9 +1116,9 @@ void RendererViewport::set_default_clear_color(const Color &p_color) { RSG::storage->set_default_clear_color(p_color); } -//workaround for setting this on thread -void RendererViewport::call_set_use_vsync(bool p_enable) { - DisplayServer::get_singleton()->_set_use_vsync(p_enable); +// Workaround for setting this on thread. +void RendererViewport::call_set_vsync_mode(DisplayServer::VSyncMode p_mode, DisplayServer::WindowID p_window) { + DisplayServer::get_singleton()->window_set_vsync_mode(p_mode, p_window); } int RendererViewport::get_total_objects_drawn() const { diff --git a/servers/rendering/renderer_viewport.h b/servers/rendering/renderer_viewport.h index b449a9fa1a..ac7a35f97d 100644 --- a/servers/rendering/renderer_viewport.h +++ b/servers/rendering/renderer_viewport.h @@ -271,8 +271,8 @@ public: int get_total_vertices_drawn() const; int get_total_draw_calls_used() const; - //workaround for setting this on thread - void call_set_use_vsync(bool p_enable); + // Workaround for setting this on thread. + void call_set_vsync_mode(DisplayServer::VSyncMode p_mode, DisplayServer::WindowID p_window); RendererViewport(); virtual ~RendererViewport() {} diff --git a/servers/rendering/rendering_server_default.h b/servers/rendering/rendering_server_default.h index 48c96cb02a..79665dcdd2 100644 --- a/servers/rendering/rendering_server_default.h +++ b/servers/rendering/rendering_server_default.h @@ -577,7 +577,7 @@ public: FUNC1RC(float, viewport_get_measured_render_time_cpu, RID) FUNC1RC(float, viewport_get_measured_render_time_gpu, RID) - FUNC1(call_set_use_vsync, bool) + FUNC2(call_set_vsync_mode, DisplayServer::VSyncMode, DisplayServer::WindowID) /* ENVIRONMENT API */ |