Drawable Renderer (#1570), clang-tidy pass

include/mbgl/renderer/renderer_observer.hpp

@@ -2,6 +2,8 @@
 
 #include <cstdint>
 #include <exception>
+#include <functional>
+#include <string>
 
 namespace mbgl {
 

src/mbgl/gfx/draw_mode.hpp

@@ -4,6 +4,7 @@
 
 #include <cassert>
 #include <cstddef>
+#include <type_traits>
 
 namespace mbgl {
 namespace gfx {

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 {

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 {
 

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);
         }

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) {

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>

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 {