diff options
author | Tobrun <tobrun@mapbox.com> | 2017-07-19 14:17:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-19 14:17:06 +0200 |
commit | 68324913d7895140e59a5ee1d13db295bbfb2522 (patch) | |
tree | 980710de76e541c9f2382956d399c1b73079acc7 /platform/android/src/native_map_view.cpp | |
parent | da581cc4855c1c342c8ff59e29938750f7e3ec2c (diff) | |
download | qtlocation-mapboxgl-68324913d7895140e59a5ee1d13db295bbfb2522.tar.gz |
[android] - rewrite map object intialisation (#9462)
Diffstat (limited to 'platform/android/src/native_map_view.cpp')
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 8cc45b3930..5a03f8af4a 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -86,6 +86,10 @@ NativeMapView::NativeMapView(jni::JNIEnv& _env, static_cast<uint32_t>(height) }, pixelRatio, fileSource, *threadPool, MapMode::Continuous, ConstrainMode::HeightOnly, ViewportMode::Default); + + // initialize egl components + _initializeDisplay(); + _initializeContext(); } /** @@ -254,22 +258,6 @@ void NativeMapView::onSourceChanged(mbgl::style::Source&) { // JNI Methods // -void NativeMapView::initializeDisplay(jni::JNIEnv&) { - _initializeDisplay(); -} - -void NativeMapView::terminateDisplay(jni::JNIEnv&) { - _terminateDisplay(); -} - -void NativeMapView::initializeContext(jni::JNIEnv&) { - _initializeContext(); -} - -void NativeMapView::terminateContext(jni::JNIEnv&) { - _terminateContext(); -} - void NativeMapView::createSurface(jni::JNIEnv& env, jni::Object<> _surface) { _createSurface(ANativeWindow_fromSurface(&env, jni::Unwrap(*_surface))); } @@ -1471,10 +1459,6 @@ void NativeMapView::registerNative(jni::JNIEnv& env) { METHOD(&NativeMapView::update, "nativeUpdate"), METHOD(&NativeMapView::resizeView, "nativeResizeView"), METHOD(&NativeMapView::resizeFramebuffer, "nativeResizeFramebuffer"), - METHOD(&NativeMapView::initializeDisplay, "nativeInitializeDisplay"), - METHOD(&NativeMapView::terminateDisplay, "nativeTerminateDisplay"), - METHOD(&NativeMapView::initializeContext, "nativeInitializeContext"), - METHOD(&NativeMapView::terminateContext, "nativeTerminateContext"), METHOD(&NativeMapView::createSurface, "nativeCreateSurface"), METHOD(&NativeMapView::destroySurface, "nativeDestroySurface"), METHOD(&NativeMapView::getStyleUrl, "nativeGetStyleUrl"), |