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_fill_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_fill_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_fill_layer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index 83989fa012..64f3448c69 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -8,6 +8,8 @@ #include <mbgl/tile/tile.hpp> #include <mbgl/style/layers/fill_layer_impl.hpp> #include <mbgl/geometry/feature_index.hpp> +#include <mbgl/gfx/cull_face_mode.hpp> +#include <mbgl/gl/context.hpp> #include <mbgl/util/math.hpp> #include <mbgl/util/intersection_tests.hpp> #include <mbgl/tile/geometry_tile.hpp> @@ -80,7 +82,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { const auto& paintPropertyBinders = bucket.paintPropertyBinders.at(getID()); const auto allUniformValues = programInstance.computeAllUniformValues( - FillProgram::UniformValues { + FillProgram::LayoutUniformValues { uniforms::u_matrix::Value( tile.translatedMatrix(evaluated.get<FillTranslate>(), evaluated.get<FillTranslateAnchor>(), @@ -169,7 +171,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { paintPropertyBinders.setPatternParameters(patternPosA, patternPosB, crossfade); const auto allUniformValues = programInstance.computeAllUniformValues( - FillPatternProgram::uniformValues( + FillPatternProgram::layoutUniformValues( tile.translatedMatrix(evaluated.get<FillTranslate>(), evaluated.get<FillTranslateAnchor>(), parameters.state), |