diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 395cf283d..2edb1ad3c 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -83,11 +83,8 @@ style::SymbolPropertyValues RenderSymbolLayer::iconPropertyValues(const style::S return style::SymbolPropertyValues { layout_.get(), // icon-pitch-alignment is not yet implemented; inherit the rotation alignment layout_.get(), - layout_.get(), evaluated.get(), evaluated.get(), - iconSize, - 1.0f, evaluated.get().constantOr(Color::black()).a > 0 && evaluated.get().constantOr(1), evaluated.get().constantOr(Color::black()).a > 0 @@ -98,11 +95,8 @@ style::SymbolPropertyValues RenderSymbolLayer::textPropertyValues(const style::S return style::SymbolPropertyValues { layout_.get(), layout_.get(), - layout_.get(), evaluated.get(), evaluated.get(), - textSize, - 24.0f, evaluated.get().constantOr(Color::black()).a > 0 && evaluated.get().constantOr(1), evaluated.get().constantOr(Color::black()).a > 0 diff --git a/src/mbgl/renderer/layers/render_symbol_layer.hpp b/src/mbgl/renderer/layers/render_symbol_layer.hpp index 8c7d43bf3..99fd09111 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.hpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.hpp @@ -40,14 +40,10 @@ public: // Layout AlignmentType pitchAlignment; AlignmentType rotationAlignment; - PossiblyEvaluatedPropertyValue layoutSize; // Paint std::array translate; TranslateAnchorType translateAnchor; - float paintSize; - - float sdfScale; // Constant (1.0 or 24.0) bool hasHalo; bool hasFill;