From 0461e6976e46cb9d9b07eea66aafe9f8a9746036 Mon Sep 17 00:00:00 2001
From: Stefan Karschti <stefan.karschti@gmail.com>
Date: Fri, 20 Oct 2023 19:10:14 +0300
Subject: [PATCH] Eliminate duplicate calls to updateRenderTileIDs (#1788)

---
 src/mbgl/renderer/layers/render_circle_layer.cpp  | 7 -------
 src/mbgl/renderer/layers/render_circle_layer.hpp  | 1 -
 src/mbgl/renderer/layers/render_fill_layer.cpp    | 7 -------
 src/mbgl/renderer/layers/render_fill_layer.hpp    | 1 -
 src/mbgl/renderer/layers/render_heatmap_layer.cpp | 7 -------
 src/mbgl/renderer/layers/render_heatmap_layer.hpp | 1 -
 src/mbgl/renderer/layers/render_line_layer.cpp    | 4 ----
 7 files changed, 28 deletions(-)

diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp
index 45660f7938a..b36b99702e7 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.cpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.cpp
@@ -64,13 +64,6 @@ RenderCircleLayer::RenderCircleLayer(Immutable<style::CircleLayer::Impl> _impl)
     : RenderLayer(makeMutable<CircleLayerProperties>(std::move(_impl))),
       unevaluated(impl_cast(baseImpl).paint.untransitioned()) {}
 
-void RenderCircleLayer::prepare(const LayerPrepareParameters& parameters) {
-    RenderLayer::prepare(parameters);
-#if MLN_DRAWABLE_RENDERER
-    updateRenderTileIDs();
-#endif // MLN_DRAWABLE_RENDERER
-}
-
 void RenderCircleLayer::transition(const TransitionParameters& parameters) {
     unevaluated = impl_cast(baseImpl).paint.transitioned(parameters, std::move(unevaluated));
 }
diff --git a/src/mbgl/renderer/layers/render_circle_layer.hpp b/src/mbgl/renderer/layers/render_circle_layer.hpp
index da8c50dbb03..ec2db3fac69 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.hpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.hpp
@@ -31,7 +31,6 @@ class RenderCircleLayer final : public RenderLayer {
 #endif
 
 private:
-    void prepare(const LayerPrepareParameters&) override;
     void transition(const TransitionParameters&) override;
     void evaluate(const PropertyEvaluationParameters&) override;
     bool hasTransition() const override;
diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp
index 0680ee68033..ce70b1f209b 100644
--- a/src/mbgl/renderer/layers/render_fill_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_layer.cpp
@@ -69,13 +69,6 @@ RenderFillLayer::RenderFillLayer(Immutable<style::FillLayer::Impl> _impl)
 
 RenderFillLayer::~RenderFillLayer() = default;
 
-void RenderFillLayer::prepare(const LayerPrepareParameters& params) {
-    RenderLayer::prepare(params);
-#if MLN_DRAWABLE_RENDERER
-    updateRenderTileIDs();
-#endif // MLN_DRAWABLE_RENDERER
-}
-
 void RenderFillLayer::transition(const TransitionParameters& parameters) {
     unevaluated = impl_cast(baseImpl).paint.transitioned(parameters, std::move(unevaluated));
 }
diff --git a/src/mbgl/renderer/layers/render_fill_layer.hpp b/src/mbgl/renderer/layers/render_fill_layer.hpp
index 9ba69f8e373..a2975954e0d 100644
--- a/src/mbgl/renderer/layers/render_fill_layer.hpp
+++ b/src/mbgl/renderer/layers/render_fill_layer.hpp
@@ -36,7 +36,6 @@ class RenderFillLayer final : public RenderLayer {
 #endif
 
 private:
-    void prepare(const LayerPrepareParameters&) override;
     void transition(const TransitionParameters&) override;
     void evaluate(const PropertyEvaluationParameters&) override;
     bool hasTransition() const override;
diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp
index f1eae101a76..65a8611a282 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp
@@ -48,13 +48,6 @@ RenderHeatmapLayer::RenderHeatmapLayer(Immutable<HeatmapLayer::Impl> _impl)
 
 RenderHeatmapLayer::~RenderHeatmapLayer() = default;
 
-void RenderHeatmapLayer::prepare(const LayerPrepareParameters& parameters) {
-    RenderLayer::prepare(parameters);
-#if MLN_DRAWABLE_RENDERER
-    updateRenderTileIDs();
-#endif // MLN_DRAWABLE_RENDERER
-}
-
 void RenderHeatmapLayer::transition(const TransitionParameters& parameters) {
     unevaluated = impl_cast(baseImpl).paint.transitioned(parameters, std::move(unevaluated));
     updateColorRamp();
diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.hpp b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
index d5c499f1173..1fecb7f0a62 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.hpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
@@ -36,7 +36,6 @@ class RenderHeatmapLayer final : public RenderLayer {
 #endif
 
 private:
-    void prepare(const LayerPrepareParameters&) override;
     void transition(const TransitionParameters&) override;
     void evaluate(const PropertyEvaluationParameters&) override;
     bool hasTransition() const override;
diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp
index 3971b2eb035..162bfb90d46 100644
--- a/src/mbgl/renderer/layers/render_line_layer.cpp
+++ b/src/mbgl/renderer/layers/render_line_layer.cpp
@@ -118,10 +118,6 @@ void RenderLineLayer::prepare(const LayerPrepareParameters& params) {
         params.lineAtlas.getDashPatternTexture(
             evaluated.get<LineDasharray>().from, evaluated.get<LineDasharray>().to, cap);
     }
-
-#if MLN_DRAWABLE_RENDERER
-    updateRenderTileIDs();
-#endif // MLN_DRAWABLE_RENDERER
 }
 
 #if MLN_LEGACY_RENDERER