Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Android GL Crash #1469

Merged
merged 1 commit into from
May 11, 2015
Merged

Android GL Crash #1469

merged 1 commit into from
May 11, 2015

Conversation

bleege
Copy link
Contributor

@bleege bleege commented May 8, 2015

Tracking commits for updating the Android to Core GL integration for #1435

@bleege bleege added Android Mapbox Maps SDK for Android crash labels May 8, 2015
@bleege bleege added this to the Android Beta milestone May 8, 2015

if (!painter) {
painter = util::make_unique<Painter>(*spriteAtlas, *glyphAtlas, *lineAtlas);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation is broken here, no?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks.

@ljbade ljbade force-pushed the 1435-android-gl-crash branch 7 times, most recently from 8beeeae to 455b394 Compare May 9, 2015 01:49
Initialise NativeMapView's EGL variables before Map

Fix hang

Add check for double pause

Add test for double pause
@ljbade ljbade force-pushed the 1435-android-gl-crash branch from 455b394 to 703e0bc Compare May 9, 2015 02:02
@ljbade
Copy link
Contributor

ljbade commented May 9, 2015

@jfirebaugh Can your review this and merge if happy once Travis passes (it should).

@ljbade
Copy link
Contributor

ljbade commented May 9, 2015

Travis passed, ready for merging.

@bleege
Copy link
Contributor Author

bleege commented May 11, 2015

This looks mostly on the Android c++ side of the house so it should be good to merge in.

bleege added a commit that referenced this pull request May 11, 2015
@bleege bleege merged commit d4fcb5b into master May 11, 2015
_mbglMap = new mbgl::Map(*_mbglView, *_mbglFileSource, mbgl::MapMode::Continuous, _isTargetingInterfaceBuilder);
_mbglMap = new mbgl::Map(*_mbglView, *_mbglFileSource, mbgl::MapMode::Continuous);
if (_isTargetingInterfaceBuilder) {
_mbglMap->pause();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test this change in Interface Builder?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, it does seem to work in Interface Builder designables, and MGLMapViews instantiated from storyboards seem to work fine.

@jfirebaugh jfirebaugh deleted the 1435-android-gl-crash branch May 12, 2015 01:38
1ec5 added a commit that referenced this pull request May 16, 2015
This reverts commit 5a918cb. The designable works fine because of #1469.

Fixes #1568.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Android Mapbox Maps SDK for Android crash
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants