From 03598ff22998dbd78e097588b42753800912c529 Mon Sep 17 00:00:00 2001 From: Tim Sylvester Date: Thu, 4 May 2023 08:45:44 -0700 Subject: [PATCH] Drawable Renderer (#1570), Eliminate extra style evaluation in layer update --- .../layers/render_background_layer.cpp | 17 ++++++---- src/mbgl/renderer/render_orchestrator.cpp | 4 +-- src/mbgl/style/layer_impl.hpp | 26 +++++++++++++-- .../style/layers/background_layer_impl.cpp | 10 +++--- .../style/layers/background_layer_impl.hpp | 33 ++++++------------- 5 files changed, 51 insertions(+), 39 deletions(-) diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index fc5b3f081..010d286b4 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -38,12 +38,11 @@ void RenderBackgroundLayer::transition(const TransitionParameters& parameters) { unevaluated = impl_cast(baseImpl).paint.transitioned(parameters, std::move(unevaluated)); } -void RenderBackgroundLayer::evaluate( - const PropertyEvaluationParameters ¶meters) { - auto properties = makeMutable( - staticImmutableCast(baseImpl), - parameters.getCrossfadeParameters(), - unevaluated.evaluate(parameters)); +void RenderBackgroundLayer::evaluate(const PropertyEvaluationParameters& parameters) { + auto evaluated = unevaluated.evaluate(parameters); + auto properties = makeMutable(staticImmutableCast(baseImpl), + parameters.getCrossfadeParameters(), + evaluated); passes = properties->evaluated.get() == 0.0f ? RenderPass::None : (!unevaluated.get().isUndefined() || @@ -53,6 +52,12 @@ void RenderBackgroundLayer::evaluate( // Supply both - evaluated based on opaquePassCutoff in render(). : RenderPass::Opaque | RenderPass::Translucent; properties->renderPasses = mbgl::underlying_type(passes); + + // Store a copy in the layer for layer::update. + // TODO: This whole method should eventually move to BackgroundLayer + const_cast(impl_cast(baseImpl)).setUnevaluated(unevaluated); + const_cast(impl_cast(baseImpl)).setEvaluated(makeMutable(evaluated)); + evaluatedProperties = std::move(properties); } diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp index 95d1ce046..bbcc044f1 100644 --- a/src/mbgl/renderer/render_orchestrator.cpp +++ b/src/mbgl/renderer/render_orchestrator.cpp @@ -794,7 +794,7 @@ void RenderOrchestrator::updateLayers(gfx::ShaderRegistry& shaders, kv.second->layerRemoved(changes); } for (auto& kv : layersAdded) { - kv.second->layerAdded(shaders, context, state, evalParameters, changes); + kv.second->layerAdded(shaders, context, state, changes); } // Layer index, similar but not identical to `layerRenderItems` index in render_impl @@ -803,7 +803,7 @@ void RenderOrchestrator::updateLayers(gfx::ShaderRegistry& shaders, auto index = static_cast(layerImpls->size()) - 1; for (auto& impl : *layerImpls) { - impl->update(index--, context, state, evalParameters, changes); + impl->update(index--, context, state, changes); } addChanges(changes); diff --git a/src/mbgl/style/layer_impl.hpp b/src/mbgl/style/layer_impl.hpp index ededc64a1..5a59604d9 100644 --- a/src/mbgl/style/layer_impl.hpp +++ b/src/mbgl/style/layer_impl.hpp @@ -1,8 +1,11 @@ #pragma once +#include #include #include #include +#include +#include #include #include @@ -66,13 +69,11 @@ public: virtual void update(int32_t /*layerIndex*/, gfx::Context&, const TransformState&, - const PropertyEvaluationParameters&, UniqueChangeRequestVec&) const {} virtual void layerAdded(gfx::ShaderRegistry&, gfx::Context&, const TransformState&, - const PropertyEvaluationParameters&, UniqueChangeRequestVec&) const {} virtual void layerRemoved(UniqueChangeRequestVec&) const {} @@ -86,6 +87,27 @@ public: protected: Impl(const Impl&) = default; + + // Add a deletion change request for each drawable in a collection + template + static void removeDrawables(T beg, + const T end, + UniqueChangeRequestVec& changes, + std::function f) { + for (; beg != end; ++beg) { + changes.emplace_back(std::make_unique(f(beg))); + } + } + + mutable util::SuppressCopies mutex; + mutable gfx::ShaderProgramBasePtr shader; + mutable std::unordered_map tileDrawables; + + mutable struct Stats { + size_t propertyEvaluations = 0; + size_t tileDrawablesAdded = 0; + size_t tileDrawablesRemoved = 0; + } stats; }; // To be used in the inherited classes. diff --git a/src/mbgl/style/layers/background_layer_impl.cpp b/src/mbgl/style/layers/background_layer_impl.cpp index 72588df6e..9d7488e34 100644 --- a/src/mbgl/style/layers/background_layer_impl.cpp +++ b/src/mbgl/style/layers/background_layer_impl.cpp @@ -19,7 +19,6 @@ namespace style { BackgroundLayer::Impl::Impl(const Impl& other) : Layer::Impl(other), - tileDrawables(other.tileDrawables), lastColor(other.lastColor), paint(other.paint) {} @@ -32,7 +31,6 @@ constexpr auto shaderName = "background_generic"; void BackgroundLayer::Impl::layerAdded(gfx::ShaderRegistry& shaders, gfx::Context& context, const TransformState&, - const PropertyEvaluationParameters&, UniqueChangeRequestVec&) const { { std::unique_lock guard(mutex); @@ -59,14 +57,14 @@ void BackgroundLayer::Impl::layerRemoved(UniqueChangeRequestVec& changes) const void BackgroundLayer::Impl::update(const int32_t layerIndex, gfx::Context& context, const TransformState& state, - const PropertyEvaluationParameters& evalParameters, UniqueChangeRequestVec& changes) const { std::unique_lock guard(mutex); - if (!unevaluated) { - unevaluated = paint.untransitioned(); + if (!unevaluatedProperties || !evaluatedProperties) { + // not evaluated yet, we can't update + return; } - const auto evaluated = unevaluated->evaluate(evalParameters); + const auto& evaluated = **evaluatedProperties; // TODO: If background is solid, we can skip drawables and rely on the clear color // const auto passes = eval.get() == 0.0f diff --git a/src/mbgl/style/layers/background_layer_impl.hpp b/src/mbgl/style/layers/background_layer_impl.hpp index e1c136abf..04064e2b9 100644 --- a/src/mbgl/style/layers/background_layer_impl.hpp +++ b/src/mbgl/style/layers/background_layer_impl.hpp @@ -1,7 +1,5 @@ #pragma once -#include -#include #include #include #include @@ -36,7 +34,6 @@ public: void layerAdded(gfx::ShaderRegistry&, gfx::Context&, const TransformState&, - const PropertyEvaluationParameters&, UniqueChangeRequestVec&) const override; void layerRemoved(UniqueChangeRequestVec&) const override; @@ -44,33 +41,23 @@ public: void update(int32_t layerIndex, gfx::Context&, const TransformState&, - const PropertyEvaluationParameters&, UniqueChangeRequestVec&) const override; -private: - // Add a deletion change request for each drawable in a collection - template - static void removeDrawables(T beg, - const T end, - UniqueChangeRequestVec& changes, - std::function f) { - for (; beg != end; ++beg) { - changes.emplace_back(std::make_unique(f(beg))); - } + void setUnevaluated(BackgroundPaintProperties::Unevaluated value) { + unevaluatedProperties = value; + } + void setEvaluated(Immutable value) { + evaluatedProperties = std::move(value); + ++stats.propertyEvaluations; } - mutable std::mutex mutex; - mutable gfx::ShaderProgramBasePtr shader; - mutable std::unordered_map tileDrawables; +private: mutable std::optional lastColor; mutable int32_t lastLayerIndex = -1; - mutable struct Stats { - size_t tileDrawablesAdded = 0; - size_t tileDrawablesRemoved = 0; - } stats; - - mutable std::optional unevaluated; + std::optional unevaluatedProperties; + // Latest evaluated properties. + std::optional> evaluatedProperties; public: BackgroundPaintProperties::Transitionable paint;