From 8bf63ddb9c271f909d699e06e70816a6c7af7ebf Mon Sep 17 00:00:00 2001 From: Jesse Bounds Date: Wed, 9 Nov 2016 09:54:13 -0800 Subject: [PATCH 1/3] Revert "[core] Band-aid for crash triggered by unbound element buffer (#6844)" This reverts commit 057b7b75cec08a2d65e714bb52655cf3960c20f1. --- src/mbgl/geometry/vao.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp index 5ab784c0c..150a6badb 100644 --- a/src/mbgl/geometry/vao.hpp +++ b/src/mbgl/geometry/vao.hpp @@ -44,9 +44,6 @@ public: storeBinding(shader, vertexBuffer.getID(), elementsBuffer.getID(), offset); } } else { - // Band-aid for https://github.com/mapbox/mapbox-gl-native/issues/5731 - elementsBuffer.bind(store); - verifyBinding(shader, vertexBuffer.getID(), elementsBuffer.getID(), offset); } } From 8a84f3b279b9049b56d163c255781fbea21f6fac Mon Sep 17 00:00:00 2001 From: Jesse Bounds Date: Wed, 9 Nov 2016 10:43:25 -0800 Subject: [PATCH 2/3] [core] Back port changes for correct GL context in Map::onLowMemory() This ports changes in https://github.com/mapbox/mapbox-gl-native/pull/6972 to this version of the map. --- src/mbgl/map/map.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 24c39fe24..6b9c4b4d5 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -833,7 +833,9 @@ void Map::setSourceTileCacheSize(size_t size) { } void Map::onLowMemory() { + impl->view.activate(); impl->store.performCleanup(); + impl->view.deactivate(); if (!impl->style) return; impl->style->onLowMemory(); impl->view.invalidate(); From 157ba2651f73fa4c1ab53d5f512f9a350b90a911 Mon Sep 17 00:00:00 2001 From: Jesse Bounds Date: Wed, 9 Nov 2016 13:56:25 -0800 Subject: [PATCH 3/3] ios-v3.3.6 --- platform/ios/CHANGELOG.md | 4 ++++ platform/ios/Mapbox-iOS-SDK-symbols.podspec | 2 +- platform/ios/Mapbox-iOS-SDK.podspec | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index ec702cd3c..47a68454d 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -2,6 +2,10 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. +## 3.3.6 + +* Fixed a crash that occurred during low-memory situations when multiple instances of MGLMapView were in the view hierarchy. The speculative fix in v3.3.5 has been reverted. ([#6972](https://github.com/mapbox/mapbox-gl-native/pull/6972)) + ## 3.3.5 * Speculatively fixed an OpenGL rendering crash. ([#6844](https://github.com/mapbox/mapbox-gl-native/pull/6844)) diff --git a/platform/ios/Mapbox-iOS-SDK-symbols.podspec b/platform/ios/Mapbox-iOS-SDK-symbols.podspec index 518448c20..565985258 100644 --- a/platform/ios/Mapbox-iOS-SDK-symbols.podspec +++ b/platform/ios/Mapbox-iOS-SDK-symbols.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |m| m.name = 'Mapbox-iOS-SDK' - m.version = '3.3.5-symbols' + m.version = '3.3.6-symbols' m.summary = 'Open source vector map solution for iOS with full styling capabilities.' m.description = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.' diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec index bba175fe4..b1dcb711b 100644 --- a/platform/ios/Mapbox-iOS-SDK.podspec +++ b/platform/ios/Mapbox-iOS-SDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |m| m.name = 'Mapbox-iOS-SDK' - m.version = '3.3.5' + m.version = '3.3.6' m.summary = 'Open source vector map solution for iOS with full styling capabilities.' m.description = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.'