From 1bef197efc88456e80aa8c7c792a24693bc455fc Mon Sep 17 00:00:00 2001
From: mwilsnd <mwilsnd@gmail.com>
Date: Thu, 6 Jul 2023 12:20:38 -0500
Subject: [PATCH] Drawable Renderer (#1570), clang-tidy pass

---
 include/mbgl/renderer/renderer_observer.hpp              | 2 ++
 src/mbgl/gfx/draw_mode.hpp                               | 1 +
 src/mbgl/layout/pattern_layout.hpp                       | 1 +
 src/mbgl/renderer/image_manager_observer.hpp             | 3 +++
 src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp | 6 ++----
 src/mbgl/renderer/layers/render_heatmap_layer.cpp        | 2 +-
 src/mbgl/sprite/sprite_loader.hpp                        | 1 +
 src/mbgl/style/collection.hpp                            | 5 ++++-
 8 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/include/mbgl/renderer/renderer_observer.hpp b/include/mbgl/renderer/renderer_observer.hpp
index fdaa40477..58889fa35 100644
--- a/include/mbgl/renderer/renderer_observer.hpp
+++ b/include/mbgl/renderer/renderer_observer.hpp
@@ -2,6 +2,8 @@
 
 #include <cstdint>
 #include <exception>
+#include <functional>
+#include <string>
 
 namespace mbgl {
 
diff --git a/src/mbgl/gfx/draw_mode.hpp b/src/mbgl/gfx/draw_mode.hpp
index f631808d0..7db823101 100644
--- a/src/mbgl/gfx/draw_mode.hpp
+++ b/src/mbgl/gfx/draw_mode.hpp
@@ -4,6 +4,7 @@
 
 #include <cassert>
 #include <cstddef>
+#include <type_traits>
 
 namespace mbgl {
 namespace gfx {
diff --git a/src/mbgl/layout/pattern_layout.hpp b/src/mbgl/layout/pattern_layout.hpp
index 8b73f3f34..7f482728c 100644
--- a/src/mbgl/layout/pattern_layout.hpp
+++ b/src/mbgl/layout/pattern_layout.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/renderer/bucket_parameters.hpp>
 #include <mbgl/renderer/render_layer.hpp>
 #include <mbgl/style/expression/image.hpp>
+#include <mbgl/style/properties.hpp>
 #include <mbgl/style/layer_properties.hpp>
 
 namespace mbgl {
diff --git a/src/mbgl/renderer/image_manager_observer.hpp b/src/mbgl/renderer/image_manager_observer.hpp
index 947c5a36b..a057c99f8 100644
--- a/src/mbgl/renderer/image_manager_observer.hpp
+++ b/src/mbgl/renderer/image_manager_observer.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
 #include <mbgl/renderer/renderer_observer.hpp>
+#include <functional>
+#include <string>
+#include <vector>
 
 namespace mbgl {
 
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
index 137be45c2..216ec1780 100644
--- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
@@ -331,8 +331,6 @@ void RenderFillExtrusionLayer::update(gfx::ShaderRegistry& shaders,
 
     std::unique_ptr<gfx::DrawableBuilder> depthBuilder;
     std::unique_ptr<gfx::DrawableBuilder> colorBuilder;
-    gfx::VertexAttributeArray vertexAttrs;
-    std::vector<uint8_t> rawVertices;
 
     const auto& shaderGroup = hasPattern ? fillExtrusionPatternGroup : fillExtrusionGroup;
     if (!shaderGroup) {
@@ -352,7 +350,7 @@ void RenderFillExtrusionLayer::update(gfx::ShaderRegistry& shaders,
         const auto& renderData = *optRenderData;
         const auto& bucket = static_cast<const FillExtrusionBucket&>(*renderData.bucket);
 
-        vertexAttrs.clear();
+        gfx::VertexAttributeArray vertexAttrs;
 
         gfx::DrawableTweakerPtr tweaker;
         if (depthBuilder) {
@@ -471,7 +469,7 @@ void RenderFillExtrusionLayer::update(gfx::ShaderRegistry& shaders,
             }
         }
 
-        rawVertices.resize(vertexSize * vertexCount);
+        std::vector<uint8_t> rawVertices(vertexSize * vertexCount);
         for (std::size_t i = 0; i < vertexCount; ++i) {
             std::memcpy(&rawVertices[vertexSize * i], &bucket.vertices.at(i).a1, vertexSize);
         }
diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp
index 13244fcf9..ba61a94f2 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp
@@ -300,7 +300,7 @@ void RenderHeatmapLayer::update(gfx::ShaderRegistry& shaders,
             return;
         }
         tileLayerGroup->setLayerTweaker(std::make_shared<HeatmapLayerTweaker>(evaluatedProperties));
-        renderTarget->addLayerGroup(tileLayerGroup, /*canReplace=*/true);
+        renderTarget->addLayerGroup(tileLayerGroup, /*replace=*/true);
     }
 
     if (renderTarget->getTexture()->getSize() != size) {
diff --git a/src/mbgl/sprite/sprite_loader.hpp b/src/mbgl/sprite/sprite_loader.hpp
index c22c030cf..373331e3b 100644
--- a/src/mbgl/sprite/sprite_loader.hpp
+++ b/src/mbgl/sprite/sprite_loader.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <mbgl/style/image.hpp>
+#include <mapbox/std/weak.hpp>
 
 #include <string>
 #include <map>
diff --git a/src/mbgl/style/collection.hpp b/src/mbgl/style/collection.hpp
index 6602ea126..2150bc89e 100644
--- a/src/mbgl/style/collection.hpp
+++ b/src/mbgl/style/collection.hpp
@@ -2,9 +2,12 @@
 
 #include <mbgl/util/immutable.hpp>
 
+#include <algorithm>
+#include <cassert>
 #include <memory>
-#include <string>
 #include <optional>
+#include <string>
+#include <vector>
 
 namespace mbgl {
 namespace style {