[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.

2 files changed, 13 insertions, 13 deletions

diff --git a/src/mbgl/programs/line_program.cpp b/src/mbgl/programs/line_program.cpp
index 9e035ff245..9428b5d9d6 100644
--- a/src/mbgl/programs/line_program.cpp
+++ b/src/mbgl/programs/line_program.cpp
@@ -19,7 +19,7 @@ using namespace style;
 static_assert(sizeof(LineLayoutVertex) == 12, "expected LineLayoutVertex size");
 
 template <class Values, class...Args>
-Values makeValues(const RenderLinePaintProperties::PossiblyEvaluated& properties,
+Values makeValues(const style::LinePaintProperties::PossiblyEvaluated& properties,
                   const RenderTile& tile,
                   const TransformState& state,
                   const std::array<float, 2>& pixelsToGLUnits,
@@ -38,7 +38,7 @@ Values makeValues(const RenderLinePaintProperties::PossiblyEvaluated& properties
 }
 
 LineProgram::LayoutUniformValues
-LineProgram::layoutUniformValues(const RenderLinePaintProperties::PossiblyEvaluated& properties,
+LineProgram::layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated& properties,
                                  const RenderTile& tile,
                                  const TransformState& state,
                                  const std::array<float, 2>& pixelsToGLUnits) {
@@ -51,7 +51,7 @@ LineProgram::layoutUniformValues(const RenderLinePaintProperties::PossiblyEvalua
 }
 
 LineSDFProgram::LayoutUniformValues
-LineSDFProgram::layoutUniformValues(const RenderLinePaintProperties::PossiblyEvaluated& properties,
+LineSDFProgram::layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated& properties,
                                     float pixelRatio,
                                     const RenderTile& tile,
                                     const TransformState& state,
@@ -88,7 +88,7 @@ LineSDFProgram::layoutUniformValues(const RenderLinePaintProperties::PossiblyEva
 }
 
 LinePatternProgram::LayoutUniformValues LinePatternProgram::layoutUniformValues(
-    const RenderLinePaintProperties::PossiblyEvaluated& properties,
+    const style::LinePaintProperties::PossiblyEvaluated& properties,
     const RenderTile& tile,
     const TransformState& state,
     const std::array<float, 2>& pixelsToGLUnits,
@@ -110,7 +110,7 @@ LinePatternProgram::LayoutUniformValues LinePatternProgram::layoutUniformValues(
 }
 
 LineGradientProgram::LayoutUniformValues LineGradientProgram::layoutUniformValues(
-    const RenderLinePaintProperties::PossiblyEvaluated& properties,
+    const style::LinePaintProperties::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 26f630a5eb..ed149abb33 100644
--- a/src/mbgl/programs/line_program.hpp
+++ b/src/mbgl/programs/line_program.hpp
@@ -39,7 +39,7 @@ class LineProgram : public Program<
         uniforms::ratio,
         uniforms::gl_units_to_pixels>,
     TypeList<>,
-    RenderLinePaintProperties>
+    style::LinePaintProperties>
 {
 public:
     using Program::Program;
@@ -90,7 +90,7 @@ public:
     static const int8_t extrudeScale = 63;
 
     static LayoutUniformValues
-    layoutUniformValues(const RenderLinePaintProperties::PossiblyEvaluated&,
+    layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&,
                         const RenderTile&,
                         const TransformState&,
                         const std::array<float, 2>& pixelsToGLUnits);
@@ -109,13 +109,13 @@ class LinePatternProgram : public Program<
         uniforms::fade>,
     TypeList<
         textures::image>,
-    RenderLinePaintProperties>
+    style::LinePaintProperties>
 {
 public:
     using Program::Program;
 
     static LayoutUniformValues
-    layoutUniformValues(const RenderLinePaintProperties::PossiblyEvaluated&,
+    layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&,
                         const RenderTile&,
                         const TransformState&,
                         const std::array<float, 2>& pixelsToGLUnits,
@@ -140,13 +140,13 @@ class LineSDFProgram : public Program<
         uniforms::sdfgamma>,
     TypeList<
         textures::image>,
-    RenderLinePaintProperties>
+    style::LinePaintProperties>
 {
 public:
     using Program::Program;
 
     static LayoutUniformValues
-    layoutUniformValues(const RenderLinePaintProperties::PossiblyEvaluated&,
+    layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&,
                         float pixelRatio,
                         const RenderTile&,
                         const TransformState&,
@@ -167,13 +167,13 @@ class LineGradientProgram : public Program<
         uniforms::gl_units_to_pixels>,
     TypeList<
         textures::image>,
-    RenderLinePaintProperties>
+    style::LinePaintProperties>
 {
 public:
     using Program::Program;
 
     static LayoutUniformValues
-    layoutUniformValues(const RenderLinePaintProperties::PossiblyEvaluated&,
+    layoutUniformValues(const style::LinePaintProperties::PossiblyEvaluated&,
                         const RenderTile&,
                         const TransformState&,
                         const std::array<float, 2>& pixelsToGLUnits);