[core] Enable property functions for line-width (#9250)

4 files changed, 20 insertions, 20 deletions

diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp
index a0b2b93e16..8f2751080f 100644
--- a/src/mbgl/programs/attributes.hpp
+++ b/src/mbgl/programs/attributes.hpp
@@ -96,6 +96,11 @@ struct a_width {
     using Type = gl::Attribute<float, 1>;
 };
 
+struct a_floorwidth {
+    static auto name() { return "a_floorwidth"; }
+    using Type = gl::Attribute<float, 1>;
+};
+
 struct a_height {
     static auto name() { return "a_height"; }
     using Type = gl::Attribute<float, 1>;
diff --git a/src/mbgl/programs/line_program.cpp b/src/mbgl/programs/line_program.cpp
index 86645588ca..db5c916d32 100644
--- a/src/mbgl/programs/line_program.cpp
+++ b/src/mbgl/programs/line_program.cpp
@@ -13,7 +13,7 @@ using namespace style;
 static_assert(sizeof(LineLayoutVertex) == 8, "expected LineLayoutVertex size");
 
 template <class Values, class...Args>
-Values makeValues(const LinePaintProperties::PossiblyEvaluated& properties,
+Values makeValues(const RenderLinePaintProperties::PossiblyEvaluated& properties,
                   const RenderTile& tile,
                   const TransformState& state,
                   const std::array<float, 2>& pixelsToGLUnits,
@@ -25,7 +25,6 @@ Values makeValues(const LinePaintProperties::PossiblyEvaluated& properties,
                                   properties.get<LineTranslateAnchor>(),
                                   state)
         },
-        uniforms::u_width::Value{ properties.get<LineWidth>() },
         uniforms::u_ratio::Value{ 1.0f / tile.id.pixelsToTileUnits(1.0, state.getZoom()) },
         uniforms::u_gl_units_to_pixels::Value{{{ 1.0f / pixelsToGLUnits[0], 1.0f / pixelsToGLUnits[1] }}},
         std::forward<Args>(args)...
@@ -33,7 +32,7 @@ Values makeValues(const LinePaintProperties::PossiblyEvaluated& properties,
 }
 
 LineProgram::UniformValues
-LineProgram::uniformValues(const LinePaintProperties::PossiblyEvaluated& properties,
+LineProgram::uniformValues(const RenderLinePaintProperties::PossiblyEvaluated& properties,
                            const RenderTile& tile,
                            const TransformState& state,
                            const std::array<float, 2>& pixelsToGLUnits) {
@@ -46,17 +45,16 @@ LineProgram::uniformValues(const LinePaintProperties::PossiblyEvaluated& propert
 }
 
 LineSDFProgram::UniformValues
-LineSDFProgram::uniformValues(const LinePaintProperties::PossiblyEvaluated& properties,
+LineSDFProgram::uniformValues(const RenderLinePaintProperties::PossiblyEvaluated& properties,
                               float pixelRatio,
                               const RenderTile& tile,
                               const TransformState& state,
                               const std::array<float, 2>& pixelsToGLUnits,
                               const LinePatternPos& posA,
                               const LinePatternPos& posB,
-                              float dashLineWidth,
                               float atlasWidth) {
-    const float widthA = posA.width * properties.get<LineDasharray>().fromScale * dashLineWidth;
-    const float widthB = posB.width * properties.get<LineDasharray>().toScale * dashLineWidth;
+    const float widthA = posA.width * properties.get<LineDasharray>().fromScale;
+    const float widthB = posB.width * properties.get<LineDasharray>().toScale;
 
     std::array<float, 2> scaleA {{
         1.0f / tile.id.pixelsToTileUnits(widthA, state.getIntegerZoom()),
@@ -84,7 +82,7 @@ LineSDFProgram::uniformValues(const LinePaintProperties::PossiblyEvaluated& prop
 }
 
 LinePatternProgram::UniformValues
-LinePatternProgram::uniformValues(const LinePaintProperties::PossiblyEvaluated& properties,
+LinePatternProgram::uniformValues(const RenderLinePaintProperties::PossiblyEvaluated& properties,
                                   const RenderTile& tile,
                                   const TransformState& state,
                                   const std::array<float, 2>& pixelsToGLUnits,
diff --git a/src/mbgl/programs/line_program.hpp b/src/mbgl/programs/line_program.hpp
index fadd351026..ed4a09bf10 100644
--- a/src/mbgl/programs/line_program.hpp
+++ b/src/mbgl/programs/line_program.hpp
@@ -7,7 +7,7 @@
 #include <mbgl/shaders/line_pattern.hpp>
 #include <mbgl/shaders/line_sdf.hpp>
 #include <mbgl/util/geometry.hpp>
-#include <mbgl/style/layers/line_layer_properties.hpp>
+#include <mbgl/renderer/layers/render_line_layer.hpp>
 
 #include <cmath>
 
@@ -20,7 +20,6 @@ class ImagePosition;
 
 namespace uniforms {
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_ratio);
-MBGL_DEFINE_UNIFORM_SCALAR(float, u_width);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_tex_y_a);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_tex_y_b);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_sdfgamma);
@@ -41,10 +40,9 @@ class LineProgram : public Program<
     LineLayoutAttributes,
     gl::Uniforms<
         uniforms::u_matrix,
-        uniforms::u_width,
         uniforms::u_ratio,
         uniforms::u_gl_units_to_pixels>,
-    style::LinePaintProperties>
+    RenderLinePaintProperties>
 {
 public:
     using Program::Program;
@@ -91,7 +89,7 @@ public:
      */
     static const int8_t extrudeScale = 63;
 
-    static UniformValues uniformValues(const style::LinePaintProperties::PossiblyEvaluated&,
+    static UniformValues uniformValues(const RenderLinePaintProperties::PossiblyEvaluated&,
                                        const RenderTile&,
                                        const TransformState&,
                                        const std::array<float, 2>& pixelsToGLUnits);
@@ -103,7 +101,6 @@ class LinePatternProgram : public Program<
     LineLayoutAttributes,
     gl::Uniforms<
         uniforms::u_matrix,
-        uniforms::u_width,
         uniforms::u_ratio,
         uniforms::u_gl_units_to_pixels,
         uniforms::u_pattern_tl_a,
@@ -115,12 +112,12 @@ class LinePatternProgram : public Program<
         uniforms::u_texsize,
         uniforms::u_fade,
         uniforms::u_image>,
-    style::LinePaintProperties>
+    RenderLinePaintProperties>
 {
 public:
     using Program::Program;
 
-    static UniformValues uniformValues(const style::LinePaintProperties::PossiblyEvaluated&,
+    static UniformValues uniformValues(const RenderLinePaintProperties::PossiblyEvaluated&,
                                        const RenderTile&,
                                        const TransformState&,
                                        const std::array<float, 2>& pixelsToGLUnits,
@@ -135,7 +132,6 @@ class LineSDFProgram : public Program<
     LineLayoutAttributes,
     gl::Uniforms<
         uniforms::u_matrix,
-        uniforms::u_width,
         uniforms::u_ratio,
         uniforms::u_gl_units_to_pixels,
         uniforms::u_patternscale_a,
@@ -145,19 +141,18 @@ class LineSDFProgram : public Program<
         uniforms::u_mix,
         uniforms::u_sdfgamma,
         uniforms::u_image>,
-    style::LinePaintProperties>
+    RenderLinePaintProperties>
 {
 public:
     using Program::Program;
 
-    static UniformValues uniformValues(const style::LinePaintProperties::PossiblyEvaluated&,
+    static UniformValues uniformValues(const RenderLinePaintProperties::PossiblyEvaluated&,
                                        float pixelRatio,
                                        const RenderTile&,
                                        const TransformState&,
                                        const std::array<float, 2>& pixelsToGLUnits,
                                        const LinePatternPos& posA,
                                        const LinePatternPos& posB,
-                                       float dashLineWidth,
                                        float atlasWidth);
 };
 
diff --git a/src/mbgl/programs/uniforms.hpp b/src/mbgl/programs/uniforms.hpp
index bec8fbe9fb..f1b2c2fb54 100644
--- a/src/mbgl/programs/uniforms.hpp
+++ b/src/mbgl/programs/uniforms.hpp
@@ -27,6 +27,8 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, u_halo_blur);
 MBGL_DEFINE_UNIFORM_SCALAR(Color, u_outline_color);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_height);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_base);
+MBGL_DEFINE_UNIFORM_SCALAR(float, u_width);
+MBGL_DEFINE_UNIFORM_SCALAR(float, u_floorwidth);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_gapwidth);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_offset);
 MBGL_DEFINE_UNIFORM_SCALAR(Size, u_world);