summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-09-15 13:00:24 +0300
committerIvo van Dongen <info@ivovandongen.nl>2017-09-18 10:07:04 +0300
commitc902df09c468eea9eafba32d61f1a5ce3134aeff (patch)
tree66cab9b500c6bf558a1e881ee08cf9641ae3e305
parentad97e45605e3fc2d48f67f92afd3dee2bfa87a9b (diff)
downloadqtlocation-mapboxgl-c902df09c468eea9eafba32d61f1a5ce3134aeff.tar.gz
[android] remove async task in renderer frontend
- Let coalescing happen on the GLThread (GLSurfaceView#requestRender)
-rw-r--r--platform/android/src/android_renderer_frontend.cpp6
-rw-r--r--platform/android/src/android_renderer_frontend.hpp3
2 files changed, 2 insertions, 7 deletions
diff --git a/platform/android/src/android_renderer_frontend.cpp b/platform/android/src/android_renderer_frontend.cpp
index 447b8afa0b..c0e5b277c6 100644
--- a/platform/android/src/android_renderer_frontend.cpp
+++ b/platform/android/src/android_renderer_frontend.cpp
@@ -63,9 +63,6 @@ private:
AndroidRendererFrontend::AndroidRendererFrontend(MapRenderer& mapRenderer_)
: mapRenderer(mapRenderer_)
- , asyncInvalidate([&]() {
- mapRenderer.requestRender();
- })
, mapRunLoop(util::RunLoop::Get()) {
}
@@ -73,6 +70,7 @@ AndroidRendererFrontend::~AndroidRendererFrontend() = default;
void AndroidRendererFrontend::reset() {
mapRenderer.reset();
+ rendererObserver.reset();
}
void AndroidRendererFrontend::setObserver(RendererObserver& observer) {
@@ -83,7 +81,7 @@ void AndroidRendererFrontend::setObserver(RendererObserver& observer) {
void AndroidRendererFrontend::update(std::shared_ptr<UpdateParameters> params) {
mapRenderer.update(std::move(params));
- asyncInvalidate.send();
+ mapRenderer.requestRender();
}
void AndroidRendererFrontend::onLowMemory() {
diff --git a/platform/android/src/android_renderer_frontend.hpp b/platform/android/src/android_renderer_frontend.hpp
index 2a8fdf55f4..598327838e 100644
--- a/platform/android/src/android_renderer_frontend.hpp
+++ b/platform/android/src/android_renderer_frontend.hpp
@@ -4,7 +4,6 @@
#include <mbgl/annotation/annotation.hpp>
#include <mbgl/renderer/renderer_backend.hpp>
#include <mbgl/renderer/renderer_frontend.hpp>
-#include <mbgl/util/async_task.hpp>
#include <mbgl/util/geo.hpp>
#include <mbgl/util/image.hpp>
#include <mbgl/util/run_loop.hpp>
@@ -55,8 +54,6 @@ private:
std::unique_ptr<RendererObserver> rendererObserver;
MapRenderer& mapRenderer;
- util::AsyncTask asyncInvalidate;
-
util::RunLoop* mapRunLoop;
// TODO