From f59ba4e3f3b48b3fbe921bd89f211f90a811e188 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Thu, 4 May 2017 20:12:32 +0300 Subject: [PATCH] Revert "[Qt] Don't regen BackendScope on every QMapboxGL::render() call" This reverts commit 806da5d940aed7021f921ab98b9ae8e4e364f732. --- platform/qt/src/qmapboxgl.cpp | 4 +--- platform/qt/src/qmapboxgl_p.hpp | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 1f4ad3b45..edb8afa28 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -1510,9 +1510,7 @@ void QMapboxGL::render() #endif // The OpenGL implementation automatically enables the OpenGL context for us. - if (!d_ptr->backendScope) { - d_ptr->backendScope = std::make_unique(*d_ptr, mbgl::BackendScope::ScopeType::Implicit); - } + mbgl::BackendScope scope { *d_ptr, mbgl::BackendScope::ScopeType::Implicit }; d_ptr->dirty = false; d_ptr->mapObj->render(*d_ptr); diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index 91b2ab752..49a7942cc 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -55,7 +55,6 @@ public: std::unique_ptr fileSourceObj; std::shared_ptr threadPool; std::unique_ptr mapObj; - std::unique_ptr backendScope; bool dirty { false };