diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2019-04-15 11:58:46 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2019-04-17 11:40:15 +0200 |
commit | d89b13f9555b3cde33499ed7bcece20c166e4dfd (patch) | |
tree | 1d52f5f57f8ba6c7b13a11655f46766169933f88 /platform/android/src | |
parent | 425553646bc79286687f240da34144b44949c9f1 (diff) | |
download | qtlocation-mapboxgl-d89b13f9555b3cde33499ed7bcece20c166e4dfd.tar.gz |
[android] - unify has surface state handling
Diffstat (limited to 'platform/android/src')
-rw-r--r-- | platform/android/src/map_renderer.cpp | 8 | ||||
-rw-r--r-- | platform/android/src/map_renderer.hpp | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/platform/android/src/map_renderer.cpp b/platform/android/src/map_renderer.cpp index 36d23c1849..64c00585f8 100644 --- a/platform/android/src/map_renderer.cpp +++ b/platform/android/src/map_renderer.cpp @@ -195,12 +195,17 @@ void MapRenderer::onSurfaceChanged(JNIEnv& env, jint width, jint height) { requestRender(); } -void MapRenderer::onSurfaceDestroyed(JNIEnv&) { +void MapRenderer::onRendererReset(JNIEnv&) { // Make sure to destroy the renderer on the GL Thread auto self = ActorRef<MapRenderer>(*this, mailbox); self.ask(&MapRenderer::resetRenderer).wait(); } +// needs to be called on GL thread +void MapRenderer::onSurfaceDestroyed(JNIEnv&) { + resetRenderer(); +} + // Static methods // void MapRenderer::registerNative(jni::JNIEnv& env) { @@ -214,6 +219,7 @@ void MapRenderer::registerNative(jni::JNIEnv& env) { jni::MakePeer<MapRenderer, const jni::Object<MapRenderer>&, jni::jfloat, const jni::String&, const jni::String&>, "nativeInitialize", "finalize", METHOD(&MapRenderer::render, "nativeRender"), + METHOD(&MapRenderer::onRendererReset, "nativeReset"), METHOD(&MapRenderer::onSurfaceCreated, "nativeOnSurfaceCreated"), METHOD(&MapRenderer::onSurfaceChanged, diff --git a/platform/android/src/map_renderer.hpp b/platform/android/src/map_renderer.hpp index 57265cebb1..efbe55af7f 100644 --- a/platform/android/src/map_renderer.hpp +++ b/platform/android/src/map_renderer.hpp @@ -94,10 +94,11 @@ private: void onSurfaceChanged(JNIEnv&, jint width, jint height); + void onSurfaceDestroyed(JNIEnv&); + private: // Called on either Main or GL thread // - - void onSurfaceDestroyed(JNIEnv&); + void onRendererReset(JNIEnv&); private: jni::WeakReference<jni::Object<MapRenderer>, jni::EnvAttachingDeleter> javaPeer; |