Merge pull request #14126 from mapbox/gfx-refactor-4

Graphics refactor #4
This commit is contained in:
Konstantin Käfer
2019-03-15 20:31:12 +01:00
committed by GitHub
parent 62695c5695
commit c8cfdb1ced
156 changed files with 2486 additions and 2573 deletions

View File

@@ -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