[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
maplibre · Mar 11, 2025 · 055850b · 055850b
1 parent 1d1ac96
commit 055850b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/include/mbgl/gfx/dynamic_texture.hpp b/include/mbgl/gfx/dynamic_texture.hpp
@@ -39,7 +39,7 @@ class DynamicTexture {
         return addImage(image.data ? image.data.get() : nullptr, image.size, id);
     }
     std::optional<TextureHandle> addImage(const void* pixelData, const Size& imageSize, int32_t id = -1);
-    
+
     void removeTexture(const TextureHandle& texHandle);
 
 private:

diff --git a/src/mbgl/gfx/drawable_atlases_tweaker.cpp b/src/mbgl/gfx/drawable_atlases_tweaker.cpp
@@ -16,11 +16,13 @@ void DrawableAtlasesTweaker::setupTextures(gfx::Drawable& drawable, const bool l
                 assert(*glyphTextureId != *iconTextureId);
                 drawable.setTexture(atlases ? gfx::Context::getDynamicTextureAlpha()->getTextureAtlas() : nullptr,
                                     *glyphTextureId);
-                drawable.setTexture(atlases ? gfx::Context::getDynamicTextureRGBA()->getTextureAtlas() : nullptr, *iconTextureId);
+                drawable.setTexture(atlases ? gfx::Context::getDynamicTextureRGBA()->getTextureAtlas() : nullptr,
+                                    *iconTextureId);
             } else {
-                drawable.setTexture(
-                    atlases ? (isText ? gfx::Context::getDynamicTextureAlpha()->getTextureAtlas() : gfx::Context::getDynamicTextureRGBA()->getTextureAtlas()) : nullptr,
-                    *glyphTextureId);
+                drawable.setTexture(atlases ? (isText ? gfx::Context::getDynamicTextureAlpha()->getTextureAtlas()
+                                                      : gfx::Context::getDynamicTextureRGBA()->getTextureAtlas())
+                                            : nullptr,
+                                    *glyphTextureId);
             }
         }
     }

diff --git a/src/mbgl/mtl/context.cpp b/src/mbgl/mtl/context.cpp
@@ -63,7 +63,7 @@ Context::~Context() noexcept {
 #if !defined(NDEBUG)
         Log::Debug(Event::General, "Rendering Stats:\n" + stats.toString("\n"));
 #endif
-        //assert(stats.isZero());
+        // assert(stats.isZero());
     }
 }
 

diff --git a/src/mbgl/renderer/image_atlas.cpp b/src/mbgl/renderer/image_atlas.cpp
@@ -7,7 +7,10 @@
 
 namespace mbgl {
 
-ImagePosition::ImagePosition(const mapbox::Bin& bin, const style::Image::Impl& image, uint32_t version_, std::optional<gfx::TextureHandle> handle_)
+ImagePosition::ImagePosition(const mapbox::Bin& bin,
+                             const style::Image::Impl& image,
+                             uint32_t version_,
+                             std::optional<gfx::TextureHandle> handle_)
     : handle(handle_),
       pixelRatio(image.pixelRatio),
       paddedRect(bin.x, bin.y, bin.w, bin.h),
@@ -56,7 +59,7 @@ ImagePositions uploadIcons(const ImageMap& icons, const ImageVersionMap& version
             iconPositions.emplace(image.id, ImagePosition{*iconHandle->getBin(), image, version, iconHandle});
         }
     }
-    
+
     return iconPositions;
 }
 
@@ -75,7 +78,7 @@ ImagePositions uploadPatterns(const ImageMap& patterns, const ImageVersionMap& v
             patternPositions.emplace(image.id, ImagePosition{*patternHandle->getBin(), image, version, patternHandle});
         }
     }
-    
+
     return patternPositions;
 }
 

diff --git a/src/mbgl/renderer/image_atlas.hpp b/src/mbgl/renderer/image_atlas.hpp
@@ -20,7 +20,10 @@ class ImageManager;
 
 class ImagePosition {
 public:
-    ImagePosition(const mapbox::Bin&, const style::Image::Impl&, uint32_t version = 0, std::optional<gfx::TextureHandle> handle = std::nullopt);
+    ImagePosition(const mapbox::Bin&,
+                  const style::Image::Impl&,
+                  uint32_t version = 0,
+                  std::optional<gfx::TextureHandle> handle = std::nullopt);
 
     static constexpr const uint16_t padding = 1u;
     std::optional<gfx::TextureHandle> handle;

diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
@@ -98,9 +98,10 @@ void GeometryTileRenderData::upload(gfx::UploadPass& uploadPass) {
     if (!imagePatches.empty()) {
         for (const auto& imagePatch : imagePatches) { // patch updated images.
 #if MLN_DRAWABLE_RENDERER
-            gfx::Context::getDynamicTextureRGBA()->getTextureAtlas()->uploadSubRegion(imagePatch.image->image,
-                                                                                      imagePatch.paddedRect.x + ImagePosition::padding,
-                                                                                      imagePatch.paddedRect.y + ImagePosition::padding);
+            gfx::Context::getDynamicTextureRGBA()->getTextureAtlas()->uploadSubRegion(
+                imagePatch.image->image,
+                imagePatch.paddedRect.x + ImagePosition::padding,
+                imagePatch.paddedRect.y + ImagePosition::padding);
 #else
             uploadPass.updateTextureSub(*atlasTextures->icon,
                                         imagePatch.image->image,

diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp
@@ -515,7 +515,8 @@ void GeometryTileWorker::finalizeLayout() {
             }
 
             // layout adds the bucket to buckets
-            layout->createBucket(patternPositions, featureIndex, renderData, firstLoad, showCollisionBoxes, id.canonical);
+            layout->createBucket(
+                patternPositions, featureIndex, renderData, firstLoad, showCollisionBoxes, id.canonical);
         }
     }
 
@@ -530,8 +531,11 @@ void GeometryTileWorker::finalizeLayout() {
                                    << id.canonical.y << " Time");
 
     parent.invoke(&GeometryTile::onLayout,
-                  std::make_shared<GeometryTile::LayoutResult>(
-                      std::move(renderData), std::move(featureIndex), std::move(glyphPositions), std::move(iconPositions), std::move(patternPositions)),
+                  std::make_shared<GeometryTile::LayoutResult>(std::move(renderData),
+                                                               std::move(featureIndex),
+                                                               std::move(glyphPositions),
+                                                               std::move(iconPositions),
+                                                               std::move(patternPositions)),
                   correlationID);
 }