diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-08 20:19:41 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-08 20:19:41 +1100 |
commit | 0487b0c6a33b0be21d284e70560459fd13006d04 (patch) | |
tree | c7e46bb8715cf133a703d7782a1ac23eb16bd02d | |
parent | 886b622a92388b45b040ec2d206d5ac0599ec8ba (diff) | |
parent | de098591c5969735f2ed4683f9cc47221f152dd1 (diff) | |
download | qtlocation-mapboxgl-0487b0c6a33b0be21d284e70560459fd13006d04.tar.gz |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/mbgl/map/map.cpp
-rw-r--r-- | include/mbgl/map/map.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/map/map.cpp | 12 | ||||
-rw-r--r-- | src/mbgl/renderer/painter.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/renderer/painter.hpp | 2 |
4 files changed, 0 insertions, 23 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 5cdd30f8a6..750dbbe023 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -64,9 +64,6 @@ public: // Forces a map update: always triggers a rerender. void update(); - // Triggers a cleanup that releases resources. - void cleanup(); - // Releases resources immediately void terminate(); @@ -157,7 +154,6 @@ private: std::thread thread; std::unique_ptr<uv::async> asyncTerminate; std::unique_ptr<uv::async> asyncRender; - std::unique_ptr<uv::async> asyncCleanup; bool terminating = false; bool pausing = false; diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index b0a06e8711..5eed5ad69a 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -160,7 +160,6 @@ void Map::start(bool startPaused) { terminating = true; // Closes all open handles on the loop. This means that the loop will automatically terminate. - asyncCleanup.reset(); asyncRender.reset(); asyncTerminate.reset(); }); @@ -184,11 +183,6 @@ void Map::start(bool startPaused) { } }); - asyncCleanup = util::make_unique<uv::async>(**loop, [this]() { - assert(painter); - painter->cleanup(); - }); - // Do we need to pause first? if (startPaused) { pause(); @@ -361,12 +355,6 @@ void Map::swapped() { rerender(); } -void Map::cleanup() { - if (asyncCleanup != nullptr) { - asyncCleanup->send(); - } -} - void Map::terminate() { assert(painter); painter->terminate(); diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index bfc59942e7..8cb456a7a6 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -31,7 +31,6 @@ Painter::Painter(SpriteAtlas& spriteAtlas_, GlyphAtlas& glyphAtlas_) } Painter::~Painter() { - cleanup(); } bool Painter::needsAnimation() const { @@ -118,11 +117,7 @@ void Painter::deleteShaders() { gaussianShader = nullptr; } -void Painter::cleanup() { -} - void Painter::terminate() { - cleanup(); deleteShaders(); } diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index be4bd12710..a39a368acb 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -64,8 +64,6 @@ public: // Perform cleanup tasks that prepare shutting down the app. This doesn't mean that the // app will be shut down. That means all operations must be automatically be reversed (e.g. through // lazy initialization) in case rendering continues. - void cleanup(); - void terminate(); // Renders the backdrop of the OpenGL view. This also paints in areas where we don't have any |