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_background_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_background_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_background_layer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index ae89a08cac..32e05a38ab 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -8,6 +8,7 @@ #include <mbgl/programs/background_program.hpp> #include <mbgl/util/tile_cover.hpp> #include <mbgl/map/transform_state.hpp> +#include <mbgl/gfx/cull_face_mode.hpp> #include <mbgl/gl/context.hpp> namespace mbgl { @@ -91,7 +92,7 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) { for (const auto& tileID : util::tileCover(parameters.state, parameters.state.getIntegerZoom())) { draw( parameters.programs.getBackgroundLayerPrograms().backgroundPattern, - BackgroundPatternProgram::uniformValues( + BackgroundPatternProgram::layoutUniformValues( parameters.matrixForTile(tileID), evaluated.get<BackgroundOpacity>(), parameters.imageManager.getPixelSize(), @@ -110,7 +111,7 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) { for (const auto& tileID : util::tileCover(parameters.state, parameters.state.getIntegerZoom())) { draw( parameters.programs.getBackgroundLayerPrograms().background, - BackgroundProgram::UniformValues { + BackgroundProgram::LayoutUniformValues { uniforms::u_matrix::Value( parameters.matrixForTile(tileID) ), uniforms::u_color::Value( evaluated.get<BackgroundColor>() ), uniforms::u_opacity::Value( evaluated.get<BackgroundOpacity>() ), |