diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-15 20:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 20:31:12 +0100 |
| commit | c8cfdb1ced822711e772dfcc8f708b1a7a68b5fc (patch) | |
| tree | bf511253e25459cafc91a5f3bea2f5c773677162 /src/mbgl/renderer/layers/render_line_layer.cpp | |
| parent | 62695c56956add5560933137a479f29f2d3a091b (diff) | |
| download | qtlocation-mapboxgl-c8cfdb1ced822711e772dfcc8f708b1a7a68b5fc.tar.gz | |
Merge pull request #14126 from mapbox/gfx-refactor-4
Graphics refactor #4
Diffstat (limited to 'src/mbgl/renderer/layers/render_line_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_line_layer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index 096afadf7d..eee151ccaa 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -8,6 +8,8 @@ #include <mbgl/geometry/line_atlas.hpp> #include <mbgl/tile/tile.hpp> #include <mbgl/style/layers/line_layer_impl.hpp> +#include <mbgl/gfx/cull_face_mode.hpp> +#include <mbgl/gl/context.hpp> #include <mbgl/geometry/feature_index.hpp> #include <mbgl/util/math.hpp> #include <mbgl/util/intersection_tests.hpp> @@ -110,7 +112,7 @@ void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { LinePatternPos posB = parameters.lineAtlas.getDashPosition(evaluated.get<LineDasharray>().to, cap); draw(parameters.programs.getLineLayerPrograms().lineSDF, - LineSDFProgram::uniformValues( + LineSDFProgram::layoutUniformValues( evaluated, parameters.pixelRatio, tile, @@ -135,7 +137,7 @@ void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { optional<ImagePosition> posB = geometryTile.getPattern(linePatternValue.to); draw(parameters.programs.getLineLayerPrograms().linePattern, - LinePatternProgram::uniformValues( + LinePatternProgram::layoutUniformValues( evaluated, tile, parameters.state, @@ -154,7 +156,7 @@ void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { } draw(parameters.programs.getLineLayerPrograms().lineGradient, - LineGradientProgram::uniformValues( + LineGradientProgram::layoutUniformValues( evaluated, tile, parameters.state, @@ -166,7 +168,7 @@ void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { }); } else { draw(parameters.programs.getLineLayerPrograms().line, - LineProgram::uniformValues( + LineProgram::layoutUniformValues( evaluated, tile, parameters.state, |