diff --git a/.github/workflows/core-release.yml b/.github/workflows/core-release.yml index ef471de8a..8d313e6b1 100644 --- a/.github/workflows/core-release.yml +++ b/.github/workflows/core-release.yml @@ -21,7 +21,10 @@ jobs: include \ vendor/maplibre-native-base/include \ vendor/maplibre-native-base/deps/variant/include \ - vendor/maplibre-native-base/deps/geometry.hpp/include + vendor/maplibre-native-base/deps/geometry.hpp/include \ + vendor/maplibre-native-base/deps/geojson.hpp/include \ + vendor/metal-cpp \ + vendor/maplibre-native-base/extras/expected-lite/include - name: Create Release run: | gh release create core-${{ github.sha }} \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f208a501..6525df594 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,8 +227,8 @@ list(APPEND SRC_FILES ) list(APPEND INCLUDE_FILES - ${PROJECT_SOURCE_DIR}/include/mbgl/actor/actor.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/actor/actor_ref.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/actor/actor.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/actor/aspiring_actor.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/actor/established_actor.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/actor/mailbox.hpp @@ -236,22 +236,22 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/actor/scheduler.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/annotation/annotation.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/backend_scope.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/backend.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/command_encoder.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/debug_group.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/fill_generator.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/gfx_types.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/polyline_generator.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/fill_generator.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/renderable.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/renderer_backend.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/rendering_stats.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/shader_registry.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/shader_group.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/shader_registry.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/shader.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/types.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/gfx/backend.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/custom_layer.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/custom_layer_render_parameters.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/custom_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/background_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/circle_layer_factory.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/custom_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/fill_extrusion_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/fill_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/heatmap_layer_factory.hpp @@ -259,17 +259,16 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/layer_manager.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/line_layer_factory.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/location_indicator_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/location_indicator_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/raster_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/layermanager/symbol_layer_factory.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/map/bound_options.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/map/camera.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/map/change.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/map/map.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/map/map_observer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/map/map_options.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/map/map_projection.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/map/map.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/map/mode.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/map/projection_mode.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/math/angles.hpp @@ -280,23 +279,24 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/platform/settings.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/platform/thread.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/renderer/query.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/renderer/renderer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/renderer/renderer_frontend.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/renderer/renderer_observer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/renderer/renderer_state.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/shaders/shader_source.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/renderer/renderer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/shaders/program_parameters.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/shaders/shader_source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/storage/database_file_source.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/storage/file_source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/storage/file_source_manager.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/storage/file_source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/storage/network_status.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/storage/offline.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/storage/online_file_source.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/storage/resource.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/storage/resource_options.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/storage/resource_transform.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/storage/resource.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/storage/response.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/color_ramp_property_value.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion_impl.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/color_ramp_property_value.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/constant.hpp @@ -304,8 +304,8 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/custom_geometry_source_options.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/filter.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/function.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/geojson.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/geojson_options.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/geojson.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/get_json_type.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/light.hpp @@ -316,7 +316,6 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/tileset.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion/transition_options.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/conversion_impl.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/assertion.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/at.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/boolean_operator.hpp @@ -324,12 +323,12 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/check_subtype.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/coalesce.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/coercion.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/collator.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/collator_expression.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/collator.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/comparison.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/compound_expression.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/dsl.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/distance.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/dsl.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/error.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/expression.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/find_zoom_curve.hpp @@ -337,8 +336,8 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/format_section_override.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/formatted.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/get_covering_stops.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/image.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/image_expression.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/image.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/in.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/index_of.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/interpolate.hpp @@ -358,15 +357,18 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/style/expression/within.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/filter.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/image.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layer_properties.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/background_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/circle_layer.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/custom_layer_render_parameters.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/custom_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/fill_extrusion_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/fill_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/heatmap_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/hillshade_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/line_layer.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/location_indicator_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/raster_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/layers/symbol_layer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/light.hpp @@ -379,23 +381,23 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/style/sources/geojson_source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/sources/image_source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/sources/raster_dem_source.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/sources/tile_source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/sources/raster_source.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/sources/tile_source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/sources/vector_source.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/sprite.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/style/style.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/style_property.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/style/style.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/transition_options.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/types.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/undefined.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/style/variable_anchor_offset_collection.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/text/glyph.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/text/glyph_range.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/text/glyph.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/tile/tile_id.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/tile/tile_operation.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/tile/tile_necessity.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/util/action_journal.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/tile/tile_operation.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/action_journal_options.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/util/action_journal.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/async_request.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/async_task.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/char_array_buffer.hpp @@ -436,10 +438,10 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/util/run_loop.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/scoped.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/size.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/util/string.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/string_indexer.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/util/tile_server_options.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/util/string.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/thread.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/util/tile_server_options.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/tileset.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/timer.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/tiny_unordered_map.hpp @@ -450,8 +452,8 @@ list(APPEND INCLUDE_FILES ${PROJECT_SOURCE_DIR}/include/mbgl/util/variant.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/vectors.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_request.hpp - ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task.hpp ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task_impl.hpp + ${PROJECT_SOURCE_DIR}/include/mbgl/util/work_task.hpp ) list(APPEND SRC_FILES ${PROJECT_SOURCE_DIR}/src/mbgl/actor/mailbox.cpp @@ -485,9 +487,7 @@ list(APPEND SRC_FILES ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/attribute.cpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/attribute.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/color_mode.hpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/command_encoder.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/cull_face_mode.hpp - ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/debug_group.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/depth_mode.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/draw_mode.hpp ${PROJECT_SOURCE_DIR}/src/mbgl/gfx/draw_scope.hpp diff --git a/LICENSES.core.md b/LICENSES.core.md index 3d876461c..5d014b24c 100644 --- a/LICENSES.core.md +++ b/LICENSES.core.md @@ -633,3 +633,209 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ``` --- + +### [metal-cpp](https://developer.apple.com/metal/cpp/) by Apple + +``` + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright © 2024 Apple Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +``` diff --git a/bazel/core.bzl b/bazel/core.bzl index 31a59b642..6dae94b45 100644 --- a/bazel/core.bzl +++ b/bazel/core.bzl @@ -141,9 +141,7 @@ MLN_CORE_SOURCE = [ "src/mbgl/gfx/attribute.cpp", "src/mbgl/gfx/attribute.hpp", "src/mbgl/gfx/color_mode.hpp", - "src/mbgl/gfx/command_encoder.hpp", "src/mbgl/gfx/cull_face_mode.hpp", - "src/mbgl/gfx/debug_group.hpp", "src/mbgl/gfx/depth_mode.hpp", "src/mbgl/gfx/draw_mode.hpp", "src/mbgl/gfx/draw_scope.hpp", @@ -611,6 +609,8 @@ MLN_CORE_SOURCE = [ }) MLN_CORE_HEADERS = [ + "include/mbgl/gfx/command_encoder.hpp", + "include/mbgl/gfx/debug_group.hpp", "include/mbgl/gfx/context.hpp", "include/mbgl/gfx/context_observer.hpp", "include/mbgl/actor/actor.hpp", @@ -840,8 +840,6 @@ MLN_OPENGL_SOURCE = [ "src/mbgl/gl/command_encoder.hpp", "src/mbgl/gl/context.cpp", "src/mbgl/gl/context.hpp", - "src/mbgl/gl/fence.cpp", - "src/mbgl/gl/fence.hpp", "src/mbgl/gl/debugging_extension.cpp", "src/mbgl/gl/debugging_extension.hpp", "src/mbgl/gl/defines.hpp", @@ -849,6 +847,8 @@ MLN_OPENGL_SOURCE = [ "src/mbgl/gl/enum.cpp", "src/mbgl/gl/enum.hpp", "src/mbgl/gl/extension.hpp", + "src/mbgl/gl/fence.cpp", + "src/mbgl/gl/fence.hpp", "src/mbgl/gl/framebuffer.hpp", "src/mbgl/gl/index_buffer_resource.cpp", "src/mbgl/gl/index_buffer_resource.hpp", diff --git a/src/mbgl/gfx/command_encoder.hpp b/include/mbgl/gfx/command_encoder.hpp similarity index 97% rename from src/mbgl/gfx/command_encoder.hpp rename to include/mbgl/gfx/command_encoder.hpp index e6018907b..817e67f42 100644 --- a/src/mbgl/gfx/command_encoder.hpp +++ b/include/mbgl/gfx/command_encoder.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include namespace mbgl { namespace gfx { diff --git a/src/mbgl/gfx/debug_group.hpp b/include/mbgl/gfx/debug_group.hpp similarity index 100% rename from src/mbgl/gfx/debug_group.hpp rename to include/mbgl/gfx/debug_group.hpp