diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-07 17:50:02 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-12 11:03:54 +0100 |
commit | e27f33062994a1b0155b44b9d471e48e93b09f8e (patch) | |
tree | eff2ba71134b9721c16fd53378b9256b94396712 /src/mbgl/programs/heatmap_texture_program.hpp | |
parent | cb64c380fbbd209cb68af60e76b7a770805353a8 (diff) | |
download | qtlocation-mapboxgl-e27f33062994a1b0155b44b9d471e48e93b09f8e.tar.gz |
[core] add texture bindings to draw call instead of Context member fn
Diffstat (limited to 'src/mbgl/programs/heatmap_texture_program.hpp')
-rw-r--r-- | src/mbgl/programs/heatmap_texture_program.hpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mbgl/programs/heatmap_texture_program.hpp b/src/mbgl/programs/heatmap_texture_program.hpp index e193c09180..a1d3835821 100644 --- a/src/mbgl/programs/heatmap_texture_program.hpp +++ b/src/mbgl/programs/heatmap_texture_program.hpp @@ -3,16 +3,13 @@ #include <mbgl/programs/program.hpp> #include <mbgl/programs/attributes.hpp> #include <mbgl/programs/uniforms.hpp> +#include <mbgl/programs/textures.hpp> #include <mbgl/shaders/heatmap_texture.hpp> #include <mbgl/style/properties.hpp> #include <mbgl/util/geometry.hpp> namespace mbgl { -namespace uniforms { -MBGL_DEFINE_UNIFORM_SCALAR(uint32_t, u_color_ramp); -} // namespace uniforms - class HeatmapTextureProgram : public Program< shaders::heatmap_texture, gfx::Triangle, @@ -20,10 +17,10 @@ class HeatmapTextureProgram : public Program< TypeList< uniforms::u_matrix, uniforms::u_world, - uniforms::u_image, - uniforms::u_color_ramp, uniforms::u_opacity>, - TypeList<>, + TypeList< + textures::u_image, + textures::u_color_ramp>, style::Properties<>> { public: using Program::Program; |