1 files changed, 32 insertions, 45 deletions
diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp
index f947c09f48..51c7cb8fc4 100644
--- a/platform/qt/src/qmapboxgl_p.hpp
+++ b/platform/qt/src/qmapboxgl_p.hpp
@@ -1,22 +1,24 @@
 #pragma once
 
 #include "qmapboxgl.hpp"
-#include "qmapboxgl_renderer_frontend_p.hpp"
+#include "qmapboxgl_map_observer.hpp"
+#include "qmapboxgl_map_renderer.hpp"
 
 #include <mbgl/actor/actor.hpp>
 #include <mbgl/map/map.hpp>
-#include <mbgl/renderer/renderer_backend.hpp>
-#include <mbgl/util/default_thread_pool.hpp>
+#include <mbgl/renderer/renderer_frontend.hpp>
 #include <mbgl/storage/default_file_source.hpp>
-#include <mbgl/util/geo.hpp>
 #include <mbgl/storage/resource_transform.hpp>
+#include <mbgl/util/default_thread_pool.hpp>
+#include <mbgl/util/geo.hpp>
 
 #include <QObject>
 #include <QSize>
 
+#include <atomic>
 #include <memory>
 
-class QMapboxGLPrivate : public QObject, public mbgl::RendererBackend, public mbgl::MapObserver
+class QMapboxGLPrivate : public QObject, public mbgl::RendererFrontend
 {
     Q_OBJECT
 
@@ -24,55 +26,40 @@ public:
     explicit QMapboxGLPrivate(QMapboxGL *, const QMapboxGLSettings &, const QSize &size, qreal pixelRatio);
     virtual ~QMapboxGLPrivate();
 
+    // mbgl::RendererFrontend implementation.
+    void reset() final {}
+    void setObserver(mbgl::RendererObserver &) final;
+    void update(std::shared_ptr<mbgl::UpdateParameters>) final;
 
-    // mbgl::RendererBackend implementation.
-    void bind() final;
-    mbgl::Size getFramebufferSize() const final;
-    void updateAssumedState() final;
-    void activate() final {}
-    void deactivate() final {}
-
-    // mbgl::MapObserver implementation.
-    void onCameraWillChange(mbgl::MapObserver::CameraChangeMode) final;
-    void onCameraIsChanging() final;
-    void onCameraDidChange(mbgl::MapObserver::CameraChangeMode) final;
-    void onWillStartLoadingMap() final;
-    void onDidFinishLoadingMap() final;
-    void onDidFailLoadingMap(std::exception_ptr) final;
-    void onWillStartRenderingFrame() final;
-    void onDidFinishRenderingFrame(mbgl::MapObserver::RenderMode) final;
-    void onWillStartRenderingMap() final;
-    void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) final;
-    void onDidFinishLoadingStyle() final;
-    void onSourceChanged(mbgl::style::Source&) final;
+    // These need to be called on the same thread.
+    void createRenderer();
+    void destroyRenderer();
+    void render();
+    void setFramebufferObject(quint32 fbo, const QSize& size);
 
     mbgl::EdgeInsets margins;
-    QSize size { 0, 0 };
-    QSize fbSize { 0, 0 };
-    quint32 fbObject = 0;
-
-    QMapboxGL *q_ptr { nullptr };
-
-    std::shared_ptr<mbgl::DefaultFileSource> fileSourceObj;
-    std::shared_ptr<mbgl::ThreadPool> threadPool;
-    std::unique_ptr<QMapboxGLRendererFrontend> frontend;
     std::unique_ptr<mbgl::Map> mapObj;
 
-    bool dirty { false };
-
-private:
-    mbgl::gl::ProcAddress getExtensionFunctionPointer(const char*) override;
-
 public slots:
-    void connectionEstablished();
-    void invalidate();
-    void render();
+    void requestRendering();
 
 signals:
     void needsRendering();
-    void mapChanged(QMapboxGL::MapChange);
-    void copyrightsChanged(const QString &copyrightsHtml);
 
 private:
-    std::unique_ptr< mbgl::Actor<mbgl::ResourceTransform> > m_resourceTransform;
+    Q_DISABLE_COPY(QMapboxGLPrivate)
+
+    std::recursive_mutex m_mapRendererMutex;
+    std::shared_ptr<mbgl::RendererObserver> m_rendererObserver;
+
+    std::unique_ptr<QMapboxGLMapObserver> m_mapObserver;
+    std::shared_ptr<mbgl::DefaultFileSource> m_fileSourceObj;
+    std::shared_ptr<mbgl::ThreadPool> m_threadPool;
+    std::unique_ptr<QMapboxGLMapRenderer> m_mapRenderer;
+    std::unique_ptr<mbgl::Actor<mbgl::ResourceTransform>> m_resourceTransform;
+
+    QMapboxGLSettings::GLContextMode m_mode;
+    qreal m_pixelRatio;
+
+    std::atomic_flag m_renderQueued = ATOMIC_FLAG_INIT;
 };