diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-09-13 08:23:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 08:23:16 +0200 |
| commit | 0b716fdb31f1780b541cbda862f2319a78be55ee (patch) | |
| tree | 738d6fa2ce8f142e8d4afe484a4da2160494e453 /servers/rendering | |
| parent | 6a8b2a4210d424935aeac14bc70c105601823549 (diff) | |
| parent | 96b7cb66df340e7f2ab379c7eefd29d74ea9e3a9 (diff) | |
Merge pull request #65727 from clayjohn/GLES3-multiwindow
Fix multiwindow support in GLES3 for X11, Windows, and MacOS.
Diffstat (limited to 'servers/rendering')
| -rw-r--r-- | servers/rendering/renderer_viewport.cpp | 9 | ||||
| -rw-r--r-- | servers/rendering/rendering_server_default.cpp | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/servers/rendering/renderer_viewport.cpp b/servers/rendering/renderer_viewport.cpp index d466f90e79..5771def45f 100644 --- a/servers/rendering/renderer_viewport.cpp +++ b/servers/rendering/renderer_viewport.cpp @@ -714,7 +714,14 @@ void RendererViewport::draw_viewports() { blit_to_screen_list[vp->viewport_to_screen] = Vector<BlitToScreen>(); } - blit_to_screen_list[vp->viewport_to_screen].push_back(blit); + if (OS::get_singleton()->get_current_rendering_driver_name() == "opengl3") { + Vector<BlitToScreen> blit_to_screen_vec; + blit_to_screen_vec.push_back(blit); + RSG::rasterizer->blit_render_targets_to_screen(vp->viewport_to_screen, blit_to_screen_vec.ptr(), 1); + RSG::rasterizer->end_frame(true); + } else { + blit_to_screen_list[vp->viewport_to_screen].push_back(blit); + } } } diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp index 1f686069bd..9103b0cf56 100644 --- a/servers/rendering/rendering_server_default.cpp +++ b/servers/rendering/rendering_server_default.cpp @@ -91,7 +91,10 @@ void RenderingServerDefault::_draw(bool p_swap_buffers, double frame_step) { RSG::viewport->draw_viewports(); RSG::canvas_render->update(); - RSG::rasterizer->end_frame(p_swap_buffers); + if (OS::get_singleton()->get_current_rendering_driver_name() != "opengl3") { + // Already called for gl_compatibility renderer. + RSG::rasterizer->end_frame(p_swap_buffers); + } XRServer *xr_server = XRServer::get_singleton(); if (xr_server != nullptr) { |