diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-03-15 18:43:58 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-03-22 15:59:10 +0100 |
| commit | 3c91b6b7de487993e75de552ba44249740644e42 (patch) | |
| tree | 69b8b2642b3d8496657db92459b0a23e130b501d /src/mbgl/map | |
| parent | d20327844cac88b6bf42b201eac35e816a189a8a (diff) | |
| download | qtlocation-mapboxgl-3c91b6b7de487993e75de552ba44249740644e42.tar.gz | |
[core] cache binary shaders on Android
Diffstat (limited to 'src/mbgl/map')
| -rw-r--r-- | src/mbgl/map/map.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 24ae5643ee..4c787eb660 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -57,7 +57,8 @@ public: MapMode, GLContextMode, ConstrainMode, - ViewportMode); + ViewportMode, + const std::string& programCacheDir); void onSourceChanged(style::Source&) override; void onUpdate(Update) override; @@ -82,6 +83,7 @@ public: const MapMode mode; const GLContextMode contextMode; const float pixelRatio; + const std::string programCacheDir; MapDebugOptions debugOptions { MapDebugOptions::NoDebug }; @@ -113,7 +115,8 @@ Map::Map(Backend& backend, MapMode mapMode, GLContextMode contextMode, ConstrainMode constrainMode, - ViewportMode viewportMode) + ViewportMode viewportMode, + const std::string& programCacheDir) : impl(std::make_unique<Impl>(*this, backend, pixelRatio, @@ -122,7 +125,8 @@ Map::Map(Backend& backend, mapMode, contextMode, constrainMode, - viewportMode)) { + viewportMode, + programCacheDir)) { impl->transform.resize(size); } @@ -134,7 +138,8 @@ Map::Impl::Impl(Map& map_, MapMode mode_, GLContextMode contextMode_, ConstrainMode constrainMode_, - ViewportMode viewportMode_) + ViewportMode viewportMode_, + const std::string& programCacheDir_) : map(map_), observer(backend_), backend(backend_), @@ -146,6 +151,7 @@ Map::Impl::Impl(Map& map_, mode(mode_), contextMode(contextMode_), pixelRatio(pixelRatio_), + programCacheDir(programCacheDir_), annotationManager(std::make_unique<AnnotationManager>(pixelRatio)), asyncInvalidate([this] { if (mode == MapMode::Continuous) { @@ -262,7 +268,7 @@ void Map::Impl::render(View& view) { updateFlags = Update::Nothing; if (!painter) { - painter = std::make_unique<Painter>(backend.getContext(), transform.getState(), pixelRatio); + painter = std::make_unique<Painter>(backend.getContext(), transform.getState(), pixelRatio, programCacheDir); } if (mode == MapMode::Continuous) { |