Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdown

Conflicts:
	src/map/map.cpp

2 files changed, 26 insertions, 0 deletions

diff --git a/src/map/map.cpp b/src/map/map.cpp
index 1399b97ee2..6da514d163 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -114,6 +114,8 @@ void Map::run() {
         prepare();
         render();
     }
+
+    view.make_inactive();
 }
 
 void Map::rerender() {
@@ -151,6 +153,11 @@ void Map::cleanup(uv_async_t *async, int status) {
     map->painter.cleanup();
 }
 
+void Map::terminate() {
+    view.make_active();
+    painter.terminate();
+}
+
 void Map::render(uv_async_t *async, int status) {
     Map *map = static_cast<Map *>(async->data);
 
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index c1705cd7cf..b1522a56b5 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -82,9 +82,28 @@ void Painter::setupShaders() {
     if (!gaussianShader) gaussianShader = std::make_unique<GaussianShader>();
 }
 
+void Painter::deleteShaders() {
+    plainShader = nullptr;
+    outlineShader = nullptr;
+    lineShader = nullptr;
+    linejoinShader = nullptr;
+    patternShader = nullptr;
+    iconShader = nullptr;
+    rasterShader = nullptr;
+    textShader = nullptr;
+    dotShader = nullptr;
+    compositeShader = nullptr;
+    gaussianShader = nullptr;
+}
+
 void Painter::cleanup() {
 }
 
+void Painter::terminate() {
+    cleanup();
+    deleteShaders();
+}
+
 void Painter::resize() {
     const TransformState &state = map.getState();
     if (gl_viewport != state.getFramebufferDimensions()) {