diff options
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/config.cmake | 2 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 5 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.hpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index dc65e7a51b..bda2c27e78 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -73,6 +73,8 @@ macro(mbgl_platform_core) PRIVATE platform/android/src/image.cpp # Thread pool + PRIVATE platform/default/mbgl/util/shared_thread_pool.cpp + PRIVATE platform/default/mbgl/util/shared_thread_pool.hpp PRIVATE platform/default/mbgl/util/default_thread_pool.cpp PRIVATE platform/default/mbgl/util/default_thread_pool.hpp diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 129eb4c19c..22711f1547 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -18,6 +18,7 @@ #include <mbgl/gl/context.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/image.hpp> +#include <mbgl/util/shared_thread_pool.hpp> #include "bitmap.hpp" @@ -29,7 +30,7 @@ NativeMapView::NativeMapView(JNIEnv *env_, jobject obj_, float pixelRatio, int a availableProcessors(availableProcessors_), totalMemory(totalMemory_), fileSource(defaultFileSource(mbgl::android::cachePath + "/mbgl-offline.db", mbgl::android::apkPath)), - threadPool(4) { + threadPool(sharedThreadPool()) { assert(env_ != nullptr); assert(obj_ != nullptr); @@ -47,7 +48,7 @@ NativeMapView::NativeMapView(JNIEnv *env_, jobject obj_, float pixelRatio, int a map = std::make_unique<mbgl::Map>( *this, mbgl::Size{ static_cast<uint32_t>(width), static_cast<uint32_t>(height) }, - pixelRatio, fileSource, threadPool, MapMode::Continuous); + pixelRatio, fileSource, *threadPool, MapMode::Continuous); float zoomFactor = map->getMaxZoom() - map->getMinZoom() + 1; float cpuFactor = availableProcessors; diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 42c8a9f40c..e776b839fc 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -97,7 +97,7 @@ private: // Ensure these are initialised last mbgl::DefaultFileSource& fileSource; - mbgl::ThreadPool threadPool; + std::shared_ptr<mbgl::ThreadPool> threadPool; std::unique_ptr<mbgl::Map> map; mbgl::EdgeInsets insets; |