diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-11 15:57:35 +0200 |
|---|---|---|
| committer | Julian Rex <julian.rex@gmail.com> | 2019-04-11 09:57:35 -0400 |
| commit | e95bf4dd9b804d6ec13417478dd1f87e888213bb (patch) | |
| tree | f3243e04427bbcb6eb8622d180c229fc68b8e239 | |
| parent | bd5527fea7da17bc5dd2f3611788702a2c708c09 (diff) | |
| download | qtlocation-mapboxgl-e95bf4dd9b804d6ec13417478dd1f87e888213bb.tar.gz | |
[ios] run glFlush when reducing memory and don't reduce memory while in background (#14383)
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 5 | ||||
| -rw-r--r-- | src/mbgl/gl/context.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 49218747ae..bbce6be961 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -831,7 +831,10 @@ public: { MGLAssertIsMainThread(); - _rendererFrontend->reduceMemoryUse(); + if ( ! self.dormant) + { + _rendererFrontend->reduceMemoryUse(); + } } #pragma mark - Layout - diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp index e91c922a50..394f2cd0d7 100644 --- a/src/mbgl/gl/context.cpp +++ b/src/mbgl/gl/context.cpp @@ -812,6 +812,8 @@ void Context::performCleanup() { abandonedRenderbuffers.data())); abandonedRenderbuffers.clear(); } + + MBGL_CHECK_ERROR(glFinish()); } #if not defined(NDEBUG) |