diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-05-03 11:41:49 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-05-08 12:27:59 +0200 |
| commit | e57a662b7a369470620480d91fbce7d5ebb57fa7 (patch) | |
| tree | 1f3f91df0d6c52f2efd7a1cafadc8774044ca591 /src/mbgl/programs/symbol_program.cpp | |
| parent | 20a807fdf36e2609973451ef8d0e49472a59db91 (diff) | |
| download | qtlocation-mapboxgl-upstream/update-gl-js.tar.gz | |
[core] upgrade mapbox-gl-js pin to the most recent versionupstream/update-gl-js
Diffstat (limited to 'src/mbgl/programs/symbol_program.cpp')
| -rw-r--r-- | src/mbgl/programs/symbol_program.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/programs/symbol_program.cpp b/src/mbgl/programs/symbol_program.cpp index d6a7a10368..b538a23331 100644 --- a/src/mbgl/programs/symbol_program.cpp +++ b/src/mbgl/programs/symbol_program.cpp @@ -87,7 +87,7 @@ Values makeValues(const bool isText, values.translateAnchor, state) ), uniforms::label_plane_matrix::Value(labelPlaneMatrix), - uniforms::gl_coord_matrix::Value( tile.translateVtxMatrix(glCoordMatrix, + uniforms::coord_matrix::Value( tile.translateVtxMatrix(glCoordMatrix, values.translate, values.translateAnchor, state, @@ -135,6 +135,7 @@ SymbolSDFProgram<Name, PaintProperties>::layoutUniformValues(const bool isText, const style::SymbolPropertyValues& values, const Size& texsize, const std::array<float, 2>& pixelsToGLUnits, + const float pixelRatio, const bool alongLine, const RenderTile& tile, const TransformState& state, @@ -155,6 +156,7 @@ SymbolSDFProgram<Name, PaintProperties>::layoutUniformValues(const bool isText, state, symbolFadeChange, uniforms::gamma_scale::Value( gammaScale ), + uniforms::device_pixel_ratio::Value( pixelRatio ), uniforms::is_halo::Value( part == SymbolSDFPart::Halo ) ); } |