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

Hillshade bucket fix for mapbox-gl-native-ios #240 #16362

Merged
merged 2 commits into from
Apr 1, 2020

Conversation

astojilj
Copy link
Contributor

@astojilj astojilj commented Apr 1, 2020

Fixes: mapbox/mapbox-gl-native-ios#240

Approach copied from RasterBucket::upload - they both use SharedBucketTileRenderData.

I don't have render test for this: it is a bit tricky since neighboring DEM tiles should not be available in the same time (otherwise this cannot be reproduced).
When dem tiles are loaded, border in neighboring tiles is updated, too leading to bucket re-upload. if std::move moved indices / vertices previously, they are empty and we get crash.
Re-upload requires that only DEM texture is re-uploaded, not the quad vertices and indices.

Verified running macosapp.

@alexshalamov alexshalamov changed the title Hillshade bucket fix https://github.com/mapbox/mapbox-gl-native-ios/i… Hillshade bucket fix for mapbox-gl-native-ios #240 Apr 1, 2020
@alexshalamov
Copy link
Contributor

alexshalamov commented Apr 1, 2020

@astojilj I added changelog entry in b644691

Also verified fix with macosapp.

@astojilj astojilj merged commit bd5932a into master Apr 1, 2020
@astojilj astojilj deleted the astojilj-native-ios-240 branch April 1, 2020 15:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using mapbox.terrain-rgb will crash on 5.8.0-alpha/beta.1
2 participants