diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2017-07-13 12:38:48 +0300 |
---|---|---|
committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-07-19 17:34:07 +0200 |
commit | e7f45e0b19eaa86b587e5269f85ecd0eb8a55de7 (patch) | |
tree | 49be6520e0bf91867f451c07477fbf8b4239d0b2 /platform | |
parent | 733661948c004dad70e634aa9f2b41402e460a6e (diff) | |
download | qtlocation-mapboxgl-e7f45e0b19eaa86b587e5269f85ecd0eb8a55de7.tar.gz |
[android] remove manual ref counting on activation/deactivation
Diffstat (limited to 'platform')
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 7 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.hpp | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 0a57d3e6b4..5b0825fa09 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -120,9 +120,6 @@ gl::ProcAddress NativeMapView::initializeExtension(const char* name) { } void NativeMapView::activate() { - if (active++) { - return; - } oldDisplay = eglGetCurrentDisplay(); oldReadSurface = eglGetCurrentSurface(EGL_READ); @@ -151,10 +148,6 @@ void NativeMapView::activate() { * From mbgl::Backend. */ void NativeMapView::deactivate() { - if (--active) { - return; - } - assert(vm != nullptr); if (oldContext != context && oldContext != EGL_NO_CONTEXT) { diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index df43ad08b7..c638de44fb 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -334,8 +334,6 @@ private: std::shared_ptr<mbgl::ThreadPool> threadPool; std::unique_ptr<mbgl::Map> map; mbgl::EdgeInsets insets; - - unsigned active = 0; }; } // namespace android |