[core] Drop LayerType

Drop LayerType and its remaining usages.
The generic code should be layer type agnostic.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mbgl/renderer/buckets/circle_bucket.cpp b/src/mbgl/renderer/buckets/circle_bucket.cpp
index 51da3eb892..b2d8d8ee98 100644
--- a/src/mbgl/renderer/buckets/circle_bucket.cpp
+++ b/src/mbgl/renderer/buckets/circle_bucket.cpp
@@ -11,8 +11,7 @@ namespace mbgl {
 using namespace style;
 
 CircleBucket::CircleBucket(const BucketParameters& parameters, const std::vector<const RenderLayer*>& layers)
-    : Bucket(LayerType::Circle),
-      mode(parameters.mode) {
+    : mode(parameters.mode) {
     for (const auto& layer : layers) {
         paintPropertyBinders.emplace(
             std::piecewise_construct,
@@ -23,6 +22,8 @@ CircleBucket::CircleBucket(const BucketParameters& parameters, const std::vector
     }
 }
 
+CircleBucket::~CircleBucket() = default;
+
 void CircleBucket::upload(gl::Context& context) {
     vertexBuffer = context.createVertexBuffer(std::move(vertices));
     indexBuffer = context.createIndexBuffer(std::move(triangles));
@@ -38,6 +39,10 @@ bool CircleBucket::hasData() const {
     return !segments.empty();
 }
 
+bool CircleBucket::supportsLayer(const style::Layer::Impl& impl) const {
+    return style::CircleLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
+}
+
 void CircleBucket::addFeature(const GeometryTileFeature& feature,
                                  const GeometryCollection& geometry,
                                  const ImagePositions&,