Merge branch 'main' into scheduler-lifetimes

.github/workflows/ios-ci.yml

@@ -235,7 +235,7 @@ jobs:
       - name: Build XCFramework
         if: env.make_release
         run: |
-          bazel build --compilation_mode=opt --features=dead_strip --objc_enable_binary_stripping \
+          bazel build --compilation_mode=opt --features=dead_strip,thin_lto --objc_enable_binary_stripping \
             --apple_generate_dsym --output_groups=+dsyms --//:renderer=metal //platform/ios:MapLibre.dynamic --embed_label=maplibre_ios_"$(cat VERSION)"
           echo xcframework="$(bazel info execution_root)"/"$(bazel cquery --output=files --compilation_mode=opt --//:renderer=metal //platform/ios:MapLibre.dynamic)" >> "$GITHUB_ENV"
           

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     files: '.*\.(hpp|cpp|h)'
     exclude: '(vendor/.*|darwin/include/mbgl/storage/reachability.h)'
 - repo: https://github.com/keith/pre-commit-buildifier
-  rev: 6.4.0
+  rev: 6.4.0.1
   hooks:
     - id: buildifier
 - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
@@ -20,7 +20,7 @@ repos:
     - id: actionlint
       additional_dependencies: [shellcheck-py]
 - repo: https://github.com/nicklockwood/SwiftFormat
-  rev: "0.53.10"
+  rev: "0.54.0"
   hooks:
     - id: swiftformat
       args: [--swiftversion, "5.8"]

CMakeLists.txt

@@ -14,6 +14,7 @@ option(MLN_WITH_WERROR "Make all compilation warnings errors" ON)
 option(MLN_LEGACY_RENDERER "Include the legacy rendering pathway" ON)
 option(MLN_DRAWABLE_RENDERER "Include the drawable rendering pathway" OFF)
 option(MLN_USE_UNORDERED_DENSE "Use ankerl dense containers for performance" ON)
+option(MLN_USE_TRACY "Enable Tracy instrumentation" OFF)
 
 if (MLN_WITH_CLANG_TIDY)
     find_program(CLANG_TIDY_COMMAND NAMES clang-tidy)
@@ -409,6 +410,7 @@ list(APPEND INCLUDE_FILES
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/image.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/immutable.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/indexed_tuple.hpp
+    ${PROJECT_SOURCE_DIR}/include/mbgl/util/instrumentation.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/interpolate.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/logging.hpp
     ${PROJECT_SOURCE_DIR}/include/mbgl/util/noncopyable.hpp
@@ -1105,13 +1107,16 @@ if(MLN_WITH_OPENGL)
             ${PROJECT_SOURCE_DIR}/src/mbgl/renderer/layers/render_custom_layer.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/render_pass.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/render_pass.hpp
+            ${PROJECT_SOURCE_DIR}/src/mbgl/gl/renderbuffer_resource.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/renderbuffer_resource.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/renderer_backend.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/state.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture_resource.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture_resource.hpp
+            ${PROJECT_SOURCE_DIR}/src/mbgl/gl/timestamp_query_extension.cpp
+            ${PROJECT_SOURCE_DIR}/src/mbgl/gl/timestamp_query_extension.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/types.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/uniform.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/uniform.hpp
@@ -1337,6 +1342,7 @@ include(${PROJECT_SOURCE_DIR}/vendor/mapbox-base.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/parsedate.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/polylabel.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/protozero.cmake)
+include(${PROJECT_SOURCE_DIR}/vendor/tracy.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/unique_resource.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/vector-tile.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/wagyu.cmake)
@@ -1377,6 +1383,7 @@ target_link_libraries(
         Mapbox::Base::geojson.hpp
         Mapbox::Base::geometry.hpp
         Mapbox::Base::variant
+        TracyClient
         unordered_dense
 )
 
@@ -1407,6 +1414,7 @@ export(TARGETS
     mbgl-vendor-unique_resource
     mbgl-vendor-vector-tile
     mbgl-vendor-wagyu
+    TracyClient
     unordered_dense
 
     FILE MapboxCoreTargets.cmake

bazel/core.bzl

@@ -829,6 +829,7 @@ MLN_CORE_HEADERS = [
     "include/mbgl/util/image.hpp",
     "include/mbgl/util/immutable.hpp",
     "include/mbgl/util/indexed_tuple.hpp",
+    "include/mbgl/util/instrumentation.hpp",
     "include/mbgl/util/interpolate.hpp",
     "include/mbgl/util/logging.hpp",
     "include/mbgl/util/monotonic_timer.hpp",
@@ -884,13 +885,16 @@ MLN_OPENGL_SOURCE = [
     "src/mbgl/gl/program.hpp",
     "src/mbgl/gl/render_pass.cpp",
     "src/mbgl/gl/render_pass.hpp",
+    "src/mbgl/gl/renderbuffer_resource.cpp",
     "src/mbgl/gl/renderbuffer_resource.hpp",
     "src/mbgl/gl/renderer_backend.cpp",
     "src/mbgl/gl/state.hpp",
     "src/mbgl/gl/texture.cpp",
     "src/mbgl/gl/texture.hpp",
     "src/mbgl/gl/texture_resource.cpp",
     "src/mbgl/gl/texture_resource.hpp",
+    "src/mbgl/gl/timestamp_query_extension.cpp",
+    "src/mbgl/gl/timestamp_query_extension.hpp",
     "src/mbgl/gl/types.hpp",
     "src/mbgl/gl/uniform.cpp",
     "src/mbgl/gl/uniform.hpp",

bazel/flags.bzl

@@ -98,7 +98,9 @@ MSVC_CPP_FLAGS = [
 ]
 
 CPP_FLAGS = select({
-    "//conditions:default": GCC_CLANG_CPP_FLAGS + WARNING_FLAGS["ios"],
+    "//conditions:default": GCC_CLANG_CPP_FLAGS,
+    "@platforms//os:ios": GCC_CLANG_CPP_FLAGS + WARNING_FLAGS["ios"] + ["-fvisibility=hidden"],
+    "@platforms//os:macos": GCC_CLANG_CPP_FLAGS + WARNING_FLAGS["macos"] + ["-fvisibility=hidden"],
     "@platforms//os:linux": GCC_CLANG_CPP_FLAGS + WARNING_FLAGS["linux"],
     "@platforms//os:windows": MSVC_CPP_FLAGS + WARNING_FLAGS["windows"],
 })