Merge pull request #1419 from mapbox/strict-pause

Ensure no GL commands are executed after pause
mapbox · May 5, 2015 · 24a0d77 · 24a0d77
2 parents da8aaa2 + 00a1f44
commit 24a0d77
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp
@@ -360,7 +360,7 @@ void NativeMapView::createSurface(ANativeWindow *window_) {
 void NativeMapView::destroySurface() {
     mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::destroySurface");
 
-    pause(true);
+    pause();
 
     if (surface != EGL_NO_SURFACE) {
         if (!eglDestroySurface(display, surface)) {
@@ -674,12 +674,11 @@ void loadExtensions() {
     }
 }
 
-void NativeMapView::pause(bool waitForPause) {
-    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::pause %s",
-                     (waitForPause) ? "true" : "false");
+void NativeMapView::pause() {
+    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::pause");
 
     if ((display != EGL_NO_DISPLAY) && (context != EGL_NO_CONTEXT)) {
-        map.pause(waitForPause);
+        map.pause();
     }
 }
 

diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp
@@ -40,7 +40,7 @@ class NativeMapView : public mbgl::View, private mbgl::util::noncopyable {
     void destroySurface();
 
     void resume();
-    void pause(bool waitForPause = false);
+    void pause();
 
     void enableFps(bool enable);
     void updateFps();

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
@@ -36,7 +36,7 @@ class Map : private util::noncopyable {
     ~Map();
 
     // Pauses the render thread. The render thread will stop running but will not be terminated and will not lose state until resumed.
-    void pause(bool waitForPause = false);
+    void pause();
 
     // Resumes a paused render thread
     void resume();

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
@@ -20,15 +20,12 @@ Map::~Map() {
     resume();
 }
 
-void Map::pause(bool waitForPause) {
+void Map::pause() {
     assert(data->mode == MapMode::Continuous);
 
     std::unique_lock<std::mutex> lockPause(data->mutexPause);
     context->invoke(&MapContext::pause);
-
-    if (waitForPause) {
-        data->condPaused.wait(lockPause);
-    }
+    data->condPaused.wait(lockPause);
 }
 
 void Map::resume() {

diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
@@ -77,6 +77,8 @@ MapContext::~MapContext() {
 }
 
 void MapContext::pause() {
+    MBGL_CHECK_ERROR(glFinish());
+
     view.deactivate();
 
     std::unique_lock<std::mutex> lockPause(data.mutexPause);