diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-03-10 15:48:11 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-03-11 16:51:45 +0200 |
| commit | b83de65813fa8a7b6e79954a1ed19bd51b6ce1e9 (patch) | |
| tree | 00bc1370d48ad15d66f240fe1b96300d738c17a4 /src/mbgl/programs | |
| parent | 6c26e141a89a1718f6f6ddf53f4a738e2558c803 (diff) | |
| download | qtlocation-mapboxgl-b83de65813fa8a7b6e79954a1ed19bd51b6ce1e9.tar.gz | |
[core] Adjust mapbox-gl-native for the updated debug shader semantics
Diffstat (limited to 'src/mbgl/programs')
| -rw-r--r-- | src/mbgl/programs/debug_program.hpp | 23 | ||||
| -rw-r--r-- | src/mbgl/programs/textures.hpp | 1 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mbgl/programs/debug_program.hpp b/src/mbgl/programs/debug_program.hpp index f1782e19e3..c96a176dbe 100644 --- a/src/mbgl/programs/debug_program.hpp +++ b/src/mbgl/programs/debug_program.hpp @@ -1,23 +1,22 @@ #pragma once -#include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> +#include <mbgl/programs/program.hpp> +#include <mbgl/programs/textures.hpp> #include <mbgl/programs/uniforms.hpp> #include <mbgl/style/properties.hpp> namespace mbgl { -class DebugProgram : public Program< - DebugProgram, - gfx::PrimitiveType::Line, - TypeList< - attributes::pos>, - TypeList< - uniforms::matrix, - uniforms::color>, - TypeList<>, - style::Properties<>> -{ +namespace uniforms { +MBGL_DEFINE_UNIFORM_SCALAR(float, overlay_scale); +} +class DebugProgram : public Program<DebugProgram, + gfx::PrimitiveType::Line, + TypeList<attributes::pos>, + TypeList<uniforms::matrix, uniforms::color, uniforms::overlay_scale>, + TypeList<textures::overlay>, + style::Properties<>> { public: using Program::Program; }; diff --git a/src/mbgl/programs/textures.hpp b/src/mbgl/programs/textures.hpp index 7d53b447b1..b525b0d44c 100644 --- a/src/mbgl/programs/textures.hpp +++ b/src/mbgl/programs/textures.hpp @@ -11,6 +11,7 @@ MBGL_DEFINE_TEXTURE(image1); MBGL_DEFINE_TEXTURE(color_ramp); MBGL_DEFINE_TEXTURE(texture); MBGL_DEFINE_TEXTURE(texture_icon); +MBGL_DEFINE_TEXTURE(overlay); } // namespace textures } // namespace mbgl |