summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/layers/render_line_layer.hpp
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-03-29 17:49:01 +0200
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-04-02 17:56:16 +0300
commitebe6f7dea33c59b91464f7c6c905600184324f3c (patch)
tree2ca2b78bbf5b82b3dc51cf8ca0abdff183b55571 /src/mbgl/renderer/layers/render_line_layer.hpp
parent45e8154d334aa967ac22910cad1f3d96f4c8e72b (diff)
downloadqtlocation-mapboxgl-ebe6f7dea33c59b91464f7c6c905600184324f3c.tar.gz
[core] Remove RenderLinePaintProperties
This patch removes the `RenderLinePaintProperties` by making `LineFloorWidth` part of the `style::LinePaintProperties`. It normalizes paint properties evaluation for the line layer.
Diffstat (limited to 'src/mbgl/renderer/layers/render_line_layer.hpp')
-rw-r--r--src/mbgl/renderer/layers/render_line_layer.hpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mbgl/renderer/layers/render_line_layer.hpp b/src/mbgl/renderer/layers/render_line_layer.hpp
index 2f76274691..cb4492ebc3 100644
--- a/src/mbgl/renderer/layers/render_line_layer.hpp
+++ b/src/mbgl/renderer/layers/render_line_layer.hpp
@@ -10,15 +10,6 @@
namespace mbgl {
-struct LineFloorwidth : style::DataDrivenPaintProperty<float, attributes::floorwidth, uniforms::floorwidth> {
- using EvaluatorType = DataDrivenPropertyEvaluator<float, true>;
- static float defaultValue() { return 1.0; }
-};
-
-class RenderLinePaintProperties : public style::ConcatenateProperties<
- style::LinePaintProperties,
- style::Properties<LineFloorwidth>> {};
-
class RenderLineLayer: public RenderLayer {
public:
using StyleLayerImpl = style::LineLayer::Impl;
@@ -44,7 +35,7 @@ public:
// Paint properties
style::LinePaintProperties::Unevaluated unevaluated;
- RenderLinePaintProperties::PossiblyEvaluated evaluated;
+ style::LinePaintProperties::PossiblyEvaluated evaluated;
const style::LineLayer::Impl& impl() const;