diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-15 20:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 20:31:12 +0100 |
| commit | c8cfdb1ced822711e772dfcc8f708b1a7a68b5fc (patch) | |
| tree | bf511253e25459cafc91a5f3bea2f5c773677162 /src/mbgl/programs/heatmap_texture_program.hpp | |
| parent | 62695c56956add5560933137a479f29f2d3a091b (diff) | |
| download | qtlocation-mapboxgl-c8cfdb1ced822711e772dfcc8f708b1a7a68b5fc.tar.gz | |
Merge pull request #14126 from mapbox/gfx-refactor-4
Graphics refactor #4
Diffstat (limited to 'src/mbgl/programs/heatmap_texture_program.hpp')
| -rw-r--r-- | src/mbgl/programs/heatmap_texture_program.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/programs/heatmap_texture_program.hpp b/src/mbgl/programs/heatmap_texture_program.hpp index a1d3835821..954e03f9b6 100644 --- a/src/mbgl/programs/heatmap_texture_program.hpp +++ b/src/mbgl/programs/heatmap_texture_program.hpp @@ -4,15 +4,14 @@ #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 { class HeatmapTextureProgram : public Program< - shaders::heatmap_texture, - gfx::Triangle, + HeatmapTextureProgram, + gfx::PrimitiveType::Triangle, TypeList<attributes::a_pos>, TypeList< uniforms::u_matrix, @@ -36,6 +35,6 @@ public: }; using HeatmapTextureLayoutVertex = HeatmapTextureProgram::LayoutVertex; -using HeatmapTextureAttributes = HeatmapTextureProgram::Attributes; +using HeatmapTextureAttributes = HeatmapTextureProgram::AttributeList; } // namespace mbgl |