diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-03-29 17:49:01 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-04-02 17:56:16 +0300 |
| commit | ebe6f7dea33c59b91464f7c6c905600184324f3c (patch) | |
| tree | 2ca2b78bbf5b82b3dc51cf8ca0abdff183b55571 /src/mbgl/programs/line_program.cpp | |
| parent | 45e8154d334aa967ac22910cad1f3d96f4c8e72b (diff) | |
| download | qtlocation-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/programs/line_program.cpp')
| -rw-r--r-- | src/mbgl/programs/line_program.cpp | 10 |
1 files changed, 5 insertions, 5 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) { |