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

Mapbox GL Native v1.6.0-rc.2 #272

Merged
merged 1 commit into from
Apr 25, 2020
Merged

Mapbox GL Native v1.6.0-rc.2 #272

merged 1 commit into from
Apr 25, 2020

Conversation

1ec5
Copy link
Contributor

@1ec5 1ec5 commented Apr 18, 2020

Upgraded to master of mapbox-gl-native in preparation for mbgl v1.6.0-rc.2. In addition to the usual submodule update, this PR unsuppresses the circle-sort-key property, removing the override added in mapbox/mapbox-gl-native#15008.

Changelog entries as of writing:

Changelog entries for macOS:

Additional changelog entries expected by the time v1.6.0-rc.2 comes out:

/cc @mapbox/maps-ios

@1ec5 1ec5 added dependencies Pull requests that update a dependency file ios build macOS labels Apr 18, 2020
@1ec5 1ec5 added this to the release-water milestone Apr 18, 2020
@1ec5 1ec5 requested a review from a team April 18, 2020 02:47
@1ec5 1ec5 self-assigned this Apr 18, 2020
@1ec5
Copy link
Contributor Author

1ec5 commented Apr 18, 2020

mapbox/mapbox-gl-native#16340 introduced a couple compiler errors in mbgl-core:

▸ Compiling render_location_indicator_layer.cpp



❌  /Users/distiller/project/vendor/mapbox-gl-native/src/mbgl/renderer/layers/render_location_indicator_layer.cpp:617:66: implicit conversion loses integer precision: 'std::__1::array::size_type' (aka 'unsigned long') to 'mbgl::platform::GLsizei' (aka 'int') [-Werror,-Wshorten-64-to-32]



        MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLE_FAN, 0, circle.size()));

                         ~~~~~~~~~~~~                     ~~~~~~~^~~~~~







❌  /Users/distiller/project/vendor/mapbox-gl-native/src/mbgl/renderer/layers/render_location_indicator_layer.cpp:621:75: implicit conversion loses integer precision: 'unsigned long' to 'mbgl::platform::GLsizei' (aka 'int') [-Werror,-Wshorten-64-to-32]



            MBGL_CHECK_ERROR(glDrawArrays(GL_LINE_STRIP, 1, circle.size() - 1));

I wonder why these -Wshorten-64-to-32 errors aren’t failing any builds in the mapbox-gl-native repository but fail here when the same CMake-generated mbgl project is built as part of the iOS map SDK workspace.

/cc @mapbox/gl-native

@galinelle
Copy link

mapbox/mapbox-gl-native#16340 introduced a couple compiler errors in mbgl-core:

▸ Compiling render_location_indicator_layer.cpp



❌  /Users/distiller/project/vendor/mapbox-gl-native/src/mbgl/renderer/layers/render_location_indicator_layer.cpp:617:66: implicit conversion loses integer precision: 'std::__1::array::size_type' (aka 'unsigned long') to 'mbgl::platform::GLsizei' (aka 'int') [-Werror,-Wshorten-64-to-32]



        MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLE_FAN, 0, circle.size()));

                         ~~~~~~~~~~~~                     ~~~~~~~^~~~~~







❌  /Users/distiller/project/vendor/mapbox-gl-native/src/mbgl/renderer/layers/render_location_indicator_layer.cpp:621:75: implicit conversion loses integer precision: 'unsigned long' to 'mbgl::platform::GLsizei' (aka 'int') [-Werror,-Wshorten-64-to-32]



            MBGL_CHECK_ERROR(glDrawArrays(GL_LINE_STRIP, 1, circle.size() - 1));

I wonder why these -Wshorten-64-to-32 errors aren’t failing any builds in the mapbox-gl-native repository but fail here when the same CMake-generated mbgl project is built as part of the iOS map SDK workspace.

/cc @mapbox/gl-native

This should be an issue for https://github.com/mapbox/mapbox-gl-native-team/issues/272 rather?

@1ec5
Copy link
Contributor Author

1ec5 commented Apr 18, 2020

mapbox/mapbox-gl-native#16413 will fix the build error.

@1ec5 1ec5 changed the title Mapbox GL Native v1.7.0 Mapbox GL Native v1.6.0 Apr 20, 2020
@1ec5 1ec5 force-pushed the 1ec5-gl-v1.7.0 branch 2 times, most recently from 8d9f276 to 72e4b5a Compare April 20, 2020 15:58
Copy link
Contributor

@fabian-guerra fabian-guerra left a comment

Choose a reason for hiding this comment

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

👍🏼

@1ec5 1ec5 force-pushed the 1ec5-gl-v1.7.0 branch 2 times, most recently from 8002e8e to 0448ad1 Compare April 24, 2020 21:23
@1ec5 1ec5 changed the title Mapbox GL Native v1.6.0 Mapbox GL Native v1.6.0-rc.2 Apr 25, 2020
@1ec5 1ec5 removed the 🛑 blocked label Apr 25, 2020
@1ec5 1ec5 merged commit 152d372 into master Apr 25, 2020
@1ec5 1ec5 deleted the 1ec5-gl-v1.7.0 branch April 25, 2020 01:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
build dependencies Pull requests that update a dependency file ios macOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants