diff options
Diffstat (limited to 'src/mbgl/programs/symbol_program.hpp')
| -rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 2ad446ae2a..158dee3013 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -28,7 +28,7 @@ class RenderTile; class TransformState; namespace uniforms { -MBGL_DEFINE_UNIFORM_MATRIX(double, 4, gl_coord_matrix); +MBGL_DEFINE_UNIFORM_MATRIX(double, 4, coord_matrix); MBGL_DEFINE_UNIFORM_MATRIX(double, 4, label_plane_matrix); MBGL_DEFINE_UNIFORM_SCALAR(bool, is_halo); MBGL_DEFINE_UNIFORM_SCALAR(float, gamma_scale); @@ -385,7 +385,7 @@ class SymbolIconProgram : public SymbolProgram< TypeList< uniforms::matrix, uniforms::label_plane_matrix, - uniforms::gl_coord_matrix, + uniforms::coord_matrix, uniforms::extrude_scale, uniforms::texsize, uniforms::fade_change, @@ -426,7 +426,7 @@ class SymbolSDFProgram : public SymbolProgram< TypeList< uniforms::matrix, uniforms::label_plane_matrix, - uniforms::gl_coord_matrix, + uniforms::coord_matrix, uniforms::extrude_scale, uniforms::texsize, uniforms::fade_change, @@ -437,6 +437,7 @@ class SymbolSDFProgram : public SymbolProgram< uniforms::rotate_symbol, uniforms::aspect_ratio, uniforms::gamma_scale, + uniforms::device_pixel_ratio, uniforms::is_halo>, TypeList< textures::texture>, @@ -450,7 +451,7 @@ public: TypeList< uniforms::matrix, uniforms::label_plane_matrix, - uniforms::gl_coord_matrix, + uniforms::coord_matrix, uniforms::extrude_scale, uniforms::texsize, uniforms::fade_change, @@ -461,6 +462,7 @@ public: uniforms::rotate_symbol, uniforms::aspect_ratio, uniforms::gamma_scale, + uniforms::device_pixel_ratio, uniforms::is_halo>, TypeList< textures::texture>, @@ -477,6 +479,7 @@ public: const style::SymbolPropertyValues&, const Size& texsize, const std::array<float, 2>& pixelsToGLUnits, + const float pixelRatio, const bool alongLine, const RenderTile&, const TransformState&, |