summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-07-13 12:38:48 +0300
committerIvo van Dongen <info@ivovandongen.nl>2017-07-17 20:35:43 +0200
commit9d0bd9622ede5bca0763e650834a20a1fcab6eb4 (patch)
tree7854d362d7b26fef7bb6350eab1a922535a5bed3
parentf78ad244150eef234d1631f721a6ad92252be921 (diff)
downloadqtlocation-mapboxgl-9d0bd9622ede5bca0763e650834a20a1fcab6eb4.tar.gz
[android] remove manual ref counting on activation/deactivation
-rwxr-xr-xplatform/android/src/native_map_view.cpp7
-rwxr-xr-xplatform/android/src/native_map_view.hpp2
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 8da2ccb6a2..4f84492789 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -117,9 +117,6 @@ gl::ProcAddress NativeMapView::initializeExtension(const char* name) {
}
void NativeMapView::activate() {
- if (active++) {
- return;
- }
oldDisplay = eglGetCurrentDisplay();
oldReadSurface = eglGetCurrentSurface(EGL_READ);
@@ -148,10 +145,6 @@ void NativeMapView::activate() {
* From mbgl::RendererBackend.
*/
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 6409237940..ef0e9e936c 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -333,8 +333,6 @@ private:
std::shared_ptr<mbgl::ThreadPool> threadPool;
std::unique_ptr<mbgl::Map> map;
mbgl::EdgeInsets insets;
-
- unsigned active = 0;
};
} // namespace android