[core] Drop LayerType

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

1 files changed, 3 insertions, 6 deletions

diff --git a/src/mbgl/renderer/buckets/circle_bucket.hpp b/src/mbgl/renderer/buckets/circle_bucket.hpp
index db61a0c112..dad8b8b377 100644
--- a/src/mbgl/renderer/buckets/circle_bucket.hpp
+++ b/src/mbgl/renderer/buckets/circle_bucket.hpp
@@ -13,9 +13,10 @@ namespace mbgl {
 
 class BucketParameters;
 
-class CircleBucket : public Bucket {
+class CircleBucket final : public Bucket {
 public:
     CircleBucket(const BucketParameters&, const std::vector<const RenderLayer*>&);
+    ~CircleBucket() override;
 
     void addFeature(const GeometryTileFeature&,
                     const GeometryCollection&,
@@ -27,6 +28,7 @@ public:
     void upload(gl::Context&) override;
 
     float getQueryRadius(const RenderLayer&) const override;
+    bool supportsLayer(const style::Layer::Impl&) const override;
 
     gl::VertexVector<CircleLayoutVertex> vertices;
     gl::IndexVector<gl::Triangles> triangles;
@@ -40,9 +42,4 @@ public:
     const MapMode mode;
 };
 
-template <>
-inline bool Bucket::is<CircleBucket>() const {
-    return layerType == style::LayerType::Circle;
-}
-
 } // namespace mbgl