Merge branch 'main' into extra-observer-hooks

.github/workflows/android-ci.yml

@@ -84,9 +84,30 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
       - name: npm install
         run: npm install --ignore-scripts
-        working-directory: platform/android
+        working-directory: .
+
+      - name: run platform/android/scripts/generate-style-code.mjs
+        run: node platform/android/scripts/generate-style-code.mjs
+        working-directory: .
+
+      - uses: pre-commit/[email protected]
+        continue-on-error: true  # this can mean files are modified, which is not an error
+        with:
+          extra_args: clang-format --all-files
+
+      - uses: pre-commit/[email protected]
+        with:
+          extra_args: clang-format --all-files
+
+      - uses: infotroph/tree-is-clean@v1
+        with:
+          check_untracked: true
 
       - uses: hendrikmuhs/[email protected]
         with:

.github/workflows/android-release.yml

@@ -114,7 +114,7 @@ jobs:
         id: prepare_release
         run: |
           RELEASE_NOTES_PATH="${PWD}/release_notes.txt"
-          ./scripts/release-notes.js > "${RELEASE_NOTES_PATH}"
+          node scripts/release-notes.mjs > "${RELEASE_NOTES_PATH}"
           echo release_notes="${RELEASE_NOTES_PATH}" >> "$GITHUB_OUTPUT"
           echo version_tag="$( git describe --tags --match=android-v*.*.* --abbrev=0 )" >> "$GITHUB_OUTPUT"
         shell: bash

BUILD.bazel

@@ -229,7 +229,6 @@ js_library(
     name = "style-spec",
     srcs = ["scripts/style-spec.mjs"],
     data = glob([
-        "scripts/style-spec-reference/*.mjs",
         "scripts/style-spec-reference/*.json",
     ]),
     visibility = ["//visibility:public"],

include/mbgl/util/instrumentation.hpp

@@ -33,24 +33,24 @@ const void* castGpuIdToTracyPtr(GpuId id) {
 #define MLN_ZONE_VALUE(n) ZoneValue(n)
 
 constexpr const char* tracyTextureMemoryLabel = "Texture Memory";
-#define MLN_TRACE_ALLOC_TEXTURE(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyTextureMemoryLabel);
-#define MLN_TRACE_FREE_TEXTURE(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyTextureMemoryLabel);
+#define MLN_TRACE_ALLOC_TEXTURE(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyTextureMemoryLabel)
+#define MLN_TRACE_FREE_TEXTURE(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyTextureMemoryLabel)
 
 constexpr const char* tracyRenderTargetMemoryLabel = "Render Target Memory";
-#define MLN_TRACE_ALLOC_RT(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyRenderTargetMemoryLabel);
-#define MLN_TRACE_FREE_RT(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyRenderTargetMemoryLabel);
+#define MLN_TRACE_ALLOC_RT(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyRenderTargetMemoryLabel)
+#define MLN_TRACE_FREE_RT(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyRenderTargetMemoryLabel)
 
 constexpr const char* tracyVertexMemoryLabel = "Vertex Buffer Memory";
-#define MLN_TRACE_ALLOC_VERTEX_BUFFER(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyVertexMemoryLabel);
-#define MLN_TRACE_FREE_VERTEX_BUFFER(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyVertexMemoryLabel);
+#define MLN_TRACE_ALLOC_VERTEX_BUFFER(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyVertexMemoryLabel)
+#define MLN_TRACE_FREE_VERTEX_BUFFER(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyVertexMemoryLabel)
 
 constexpr const char* tracyIndexMemoryLabel = "Index Buffer Memory";
-#define MLN_TRACE_ALLOC_INDEX_BUFFER(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyIndexMemoryLabel);
-#define MLN_TRACE_FREE_INDEX_BUFFER(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyIndexMemoryLabel);
+#define MLN_TRACE_ALLOC_INDEX_BUFFER(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyIndexMemoryLabel)
+#define MLN_TRACE_FREE_INDEX_BUFFER(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyIndexMemoryLabel)
 
 constexpr const char* tracyConstMemoryLabel = "Constant Buffer Memory";
-#define MLN_TRACE_ALLOC_CONST_BUFFER(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyConstMemoryLabel);
-#define MLN_TRACE_FREE_CONST_BUFFER(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyConstMemoryLabel);
+#define MLN_TRACE_ALLOC_CONST_BUFFER(id, size) TracyAllocN(castGpuIdToTracyPtr(id), size, tracyConstMemoryLabel)
+#define MLN_TRACE_FREE_CONST_BUFFER(id) TracyFreeN(castGpuIdToTracyPtr(id), tracyConstMemoryLabel)
 
 // Only OpenGL is currently considered for GPU profiling
 // Metal and other APIs need to be handled separately
@@ -70,9 +70,9 @@ constexpr const char* tracyConstMemoryLabel = "Constant Buffer Memory";
 
 #include "tracy/TracyOpenGL.hpp"
 
-#define MLN_TRACE_GL_CONTEXT() TracyGpuContext;
-#define MLN_TRACE_GL_ZONE(label) TracyGpuZone(#label);
-#define MLN_TRACE_FUNC_GL() TracyGpuZone(__FUNCTION__);
+#define MLN_TRACE_GL_CONTEXT() TracyGpuContext
+#define MLN_TRACE_GL_ZONE(label) TracyGpuZone(#label)
+#define MLN_TRACE_FUNC_GL() TracyGpuZone(__FUNCTION__)
 
 #define MLN_END_FRAME()  \
     do {                 \
@@ -90,33 +90,33 @@ constexpr const char* tracyConstMemoryLabel = "Constant Buffer Memory";
 
 #else // MLN_RENDER_BACKEND_OPENGL
 
-#define MLN_TRACE_GL_CONTEXT()
-#define MLN_TRACE_GL_ZONE(label)
-#define MLN_TRACE_FUNC_GL()
+#define MLN_TRACE_GL_CONTEXT() ((void)0)
+#define MLN_TRACE_GL_ZONE(label) ((void)0)
+#define MLN_TRACE_FUNC_GL() ((void)0)
 #define MLN_END_FRAME() FrameMark;
 
 #endif // MLN_RENDER_BACKEND_OPENGL
 
 #else // MLN_TRACY_ENABLE
 
-#define MLN_TRACE_GL_CONTEXT()
-#define MLN_TRACE_GL_ZONE(label)
-#define MLN_ZONE_TEXT(label)
-#define MLN_ZONE_STR(str)
-#define MLN_ZONE_VALUE(val)
-#define MLN_TRACE_FUNC_GL()
-#define MLN_END_FRAME()
-#define MLN_TRACE_ALLOC_TEXTURE(id, size)
-#define MLN_TRACE_FREE_TEXTURE(id)
-#define MLN_TRACE_ALLOC_RT(id, size)
-#define MLN_TRACE_FREE_RT(id)
-#define MLN_TRACE_ALLOC_VERTEX_BUFFER(id, size)
-#define MLN_TRACE_FREE_VERTEX_BUFFER(id)
-#define MLN_TRACE_ALLOC_INDEX_BUFFER(id, size)
-#define MLN_TRACE_FREE_INDEX_BUFFER(id)
-#define MLN_TRACE_ALLOC_CONST_BUFFER(id, size)
-#define MLN_TRACE_FREE_CONST_BUFFER(id)
-#define MLN_TRACE_FUNC()
-#define MLN_TRACE_ZONE(label)
+#define MLN_TRACE_GL_CONTEXT() ((void)0)
+#define MLN_TRACE_GL_ZONE(label) ((void)0)
+#define MLN_ZONE_TEXT(label) ((void)0)
+#define MLN_ZONE_STR(str) ((void)0)
+#define MLN_ZONE_VALUE(val) ((void)0)
+#define MLN_TRACE_FUNC_GL() ((void)0)
+#define MLN_END_FRAME() ((void)0)
+#define MLN_TRACE_ALLOC_TEXTURE(id, size) ((void)0)
+#define MLN_TRACE_FREE_TEXTURE(id) ((void)0)
+#define MLN_TRACE_ALLOC_RT(id, size) ((void)0)
+#define MLN_TRACE_FREE_RT(id) ((void)0)
+#define MLN_TRACE_ALLOC_VERTEX_BUFFER(id, size) ((void)0)
+#define MLN_TRACE_FREE_VERTEX_BUFFER(id) ((void)0)
+#define MLN_TRACE_ALLOC_INDEX_BUFFER(id, size) ((void)0)
+#define MLN_TRACE_FREE_INDEX_BUFFER(id) ((void)0)
+#define MLN_TRACE_ALLOC_CONST_BUFFER(id, size) ((void)0)
+#define MLN_TRACE_FREE_CONST_BUFFER(id) ((void)0)
+#define MLN_TRACE_FUNC() ((void)0)
+#define MLN_TRACE_ZONE(label) ((void)0)
 
 #endif // MLN_TRACY_ENABLE

include/mbgl/util/logging.hpp

@@ -38,8 +38,11 @@ class Log {
     Log();
     ~Log();
 
-    static void useLogThread(bool enable) noexcept;
-    static void useLogThread(bool enable, EventSeverity) noexcept;
+    /// @brief Determines whether messages of a given severity level are logged asynchronously.
+    ///
+    /// In a crash or other unexpected termination, pending asynchronous log entries will be lost.
+    /// The default is true (asynchronous) for all levels except `Error`.
+    static void useLogThread(bool enable, std::optional<EventSeverity> = {});
 
     template <typename... Args>
     static void Debug(Event event, Args&&... args) noexcept {

include/mbgl/util/string.hpp

@@ -78,9 +78,7 @@ inline std::string toString(long double t, bool decimal = false) {
     return toString(static_cast<double>(t), decimal);
 }
 
-inline std::string toString(std::thread::id threadId) {
-    return (std::ostringstream() << threadId).str();
-}
+std::string toString(const std::thread::id &);
 
 std::string toString(const std::exception_ptr &);