Skip to content

Commit

Permalink
Eliminate duplicate calls to updateRenderTileIDs (#1788)
Browse files Browse the repository at this point in the history
  • Loading branch information
stefankarschti authored Oct 20, 2023
1 parent aecc03c commit 0461e69
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 28 deletions.
7 changes: 0 additions & 7 deletions src/mbgl/renderer/layers/render_circle_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
1 change: 0 additions & 1 deletion src/mbgl/renderer/layers/render_circle_layer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions src/mbgl/renderer/layers/render_fill_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
1 change: 0 additions & 1 deletion src/mbgl/renderer/layers/render_fill_layer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions src/mbgl/renderer/layers/render_heatmap_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/mbgl/renderer/layers/render_heatmap_layer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions src/mbgl/renderer/layers/render_line_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0461e69

Please sign in to comment.