diff options
| author | Mike Morris <mikemorris@users.noreply.github.com> | 2016-10-12 17:28:22 -0400 |
|---|---|---|
| committer | Mike Morris <mikemorris@users.noreply.github.com> | 2016-10-20 14:37:36 -0400 |
| commit | 817c26111a0d6650e7ebae73e46621626106d0a7 (patch) | |
| tree | 60a5206f2f7658b06b214d9b7435a65a243d6e83 /platform/qt | |
| parent | ab85fdb4524788ce7279e8ac362a0c1edbd5d5df (diff) | |
| download | qtlocation-mapboxgl-817c26111a0d6650e7ebae73e46621626106d0a7.tar.gz | |
[core] [node] pass thread pool impl to Map constructor
Updates mbgl::Map constructor usage everywhere
Adds NodeThreadPool implementation using AsyncQueue to call
Nan::AsyncQueueWorker from main thread
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/qt.cmake | 3 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 3 | ||||
| -rw-r--r-- | platform/qt/src/qmapboxgl_p.hpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index dc60455b0a..398e173cfa 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -30,6 +30,9 @@ set(MBGL_QT_FILES # Misc PRIVATE platform/default/log_stderr.cpp + # Thread pool + PRIVATE platform/default/thread_pool.cpp + # Platform integration PRIVATE platform/qt/src/async_task.cpp PRIVATE platform/qt/src/async_task_impl.hpp diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 103ed83256..d0a05301f8 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -811,8 +811,9 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin settings.cacheDatabasePath().toStdString(), settings.assetPath().toStdString(), settings.cacheDatabaseMaximumSize())) + , threadPool(4) , mapObj(std::make_unique<mbgl::Map>( - *this, *fileSourceObj, + *this, *fileSourceObj, threadPool, static_cast<mbgl::MapMode>(settings.mapMode()), static_cast<mbgl::GLContextMode>(settings.contextMode()), static_cast<mbgl::ConstrainMode>(settings.constrainMode()), diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index 11b5f695ca..c35ac4e7ba 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -4,6 +4,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/map/view.hpp> +#include <mbgl/platform/default/thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/geo.hpp> @@ -34,6 +35,7 @@ public: QMapboxGL *q_ptr { nullptr }; std::unique_ptr<mbgl::DefaultFileSource> fileSourceObj; + mbgl::ThreadPool threadPool; std::unique_ptr<mbgl::Map> mapObj; bool dirty { false }; |