diff options
| author | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-02-14 11:28:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 11:28:51 -0800 |
| commit | a386cac452b333d3e9656efd04e98035cd6b1c57 (patch) | |
| tree | c9ea94c38d35ee42f0dbe7f57cf7a8aadcb87147 /src/mbgl/programs/hillshade_prepare_program.hpp | |
| parent | d4df044ffe2234e3d14d1d86727372cd8e4953d8 (diff) | |
| download | qtlocation-mapboxgl-a386cac452b333d3e9656efd04e98035cd6b1c57.tar.gz | |
[core] add maxzoom uniform for raster-dem tilesets (#11134)
* add maxzoom uniform to support external tilesets
* update git sha for gl-js
* try and fix android crash
* name default maxzoom constant
Diffstat (limited to 'src/mbgl/programs/hillshade_prepare_program.hpp')
| -rw-r--r-- | src/mbgl/programs/hillshade_prepare_program.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/programs/hillshade_prepare_program.hpp b/src/mbgl/programs/hillshade_prepare_program.hpp index 0f31a22df5..76638afddd 100644 --- a/src/mbgl/programs/hillshade_prepare_program.hpp +++ b/src/mbgl/programs/hillshade_prepare_program.hpp @@ -10,6 +10,7 @@ namespace mbgl { namespace uniforms { MBGL_DEFINE_UNIFORM_VECTOR(uint16_t, 2, u_dimension); +MBGL_DEFINE_UNIFORM_SCALAR(float, u_maxzoom); } // namespace uniforms class HillshadePrepareProgram : public Program< @@ -22,6 +23,7 @@ class HillshadePrepareProgram : public Program< uniforms::u_matrix, uniforms::u_dimension, uniforms::u_zoom, + uniforms::u_maxzoom, uniforms::u_image>, style::Properties<>> { public: |