summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/heatmap_program.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/programs/heatmap_program.hpp')
-rw-r--r--src/mbgl/programs/heatmap_program.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/programs/heatmap_program.hpp b/src/mbgl/programs/heatmap_program.hpp
index 9563dd8d1b..537a9e9565 100644
--- a/src/mbgl/programs/heatmap_program.hpp
+++ b/src/mbgl/programs/heatmap_program.hpp
@@ -10,18 +10,18 @@
namespace mbgl {
namespace uniforms {
-MBGL_DEFINE_UNIFORM_SCALAR(float, u_intensity);
+MBGL_DEFINE_UNIFORM_SCALAR(float, intensity);
} // namespace uniforms
class HeatmapProgram : public Program<
HeatmapProgram,
gfx::PrimitiveType::Triangle,
TypeList<
- attributes::a_pos>,
+ attributes::pos>,
TypeList<
- uniforms::u_intensity,
- uniforms::u_matrix,
- uniforms::heatmap::u_extrude_scale>,
+ uniforms::intensity,
+ uniforms::matrix,
+ uniforms::heatmap::extrude_scale>,
TypeList<>,
style::HeatmapPaintProperties>
{
@@ -52,7 +52,7 @@ public:
HeatmapLayerPrograms(gfx::Context& context, const ProgramParameters& programParameters)
: heatmap(context, programParameters),
heatmapTexture(context, programParameters) {}
- ProgramMap<HeatmapProgram> heatmap;
+ HeatmapProgram heatmap;
HeatmapTextureProgram heatmapTexture;
};