summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/circle_program.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/programs/circle_program.hpp')
-rw-r--r--src/mbgl/programs/circle_program.hpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mbgl/programs/circle_program.hpp b/src/mbgl/programs/circle_program.hpp
index 5a381d8fa9..0caa1b2a15 100644
--- a/src/mbgl/programs/circle_program.hpp
+++ b/src/mbgl/programs/circle_program.hpp
@@ -3,7 +3,6 @@
#include <mbgl/programs/program.hpp>
#include <mbgl/programs/attributes.hpp>
#include <mbgl/programs/uniforms.hpp>
-#include <mbgl/shaders/circle.hpp>
#include <mbgl/util/geometry.hpp>
#include <mbgl/style/layers/circle_layer_properties.hpp>
@@ -14,8 +13,8 @@ MBGL_DEFINE_UNIFORM_SCALAR(bool, u_scale_with_map);
} // namespace uniforms
class CircleProgram : public Program<
- shaders::circle,
- gfx::Triangle,
+ CircleProgram,
+ gfx::PrimitiveType::Triangle,
TypeList<
attributes::a_pos>,
TypeList<
@@ -47,11 +46,11 @@ public:
};
using CircleLayoutVertex = CircleProgram::LayoutVertex;
-using CircleAttributes = CircleProgram::Attributes;
+using CircleAttributes = CircleProgram::AttributeList;
class CircleLayerPrograms final : public LayerTypePrograms {
public:
- CircleLayerPrograms(gl::Context& context, const ProgramParameters& programParameters)
+ CircleLayerPrograms(gfx::Context& context, const ProgramParameters& programParameters)
: circle(context, programParameters) {}
ProgramMap<CircleProgram> circle;
};