diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-12-21 14:14:03 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-01-04 11:51:33 +0200 |
commit | c621b8100d8f75a77789371d8c33a7f5dff18651 (patch) | |
tree | c9b1290a8496d28f0f55f91ae79d58da0ed945e6 /src/mbgl/renderer/buckets/symbol_bucket.hpp | |
parent | 4e86bca5abecdaa6dcdc361421fe73655e7e1b69 (diff) | |
download | qtlocation-mapboxgl-c621b8100d8f75a77789371d8c33a7f5dff18651.tar.gz |
[core] Drop LayerType
Drop LayerType and its remaining usages.
The generic code should be layer type agnostic.
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 5addff40b2..ccb2cce513 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -37,7 +37,7 @@ public: size_t vertexStartIndex; }; -class SymbolBucket : public Bucket { +class SymbolBucket final : public Bucket { public: SymbolBucket(style::SymbolLayoutProperties::PossiblyEvaluated, const std::map<std::string, std::pair<style::IconPaintProperties::PossiblyEvaluated, style::TextPaintProperties::PossiblyEvaluated>>&, @@ -49,9 +49,11 @@ public: bool sortFeaturesByY, const std::string bucketLeaderID, const std::vector<SymbolInstance>&&); + ~SymbolBucket() override; void upload(gl::Context&) override; bool hasData() const override; + bool supportsLayer(const style::Layer::Impl&) const override; bool hasTextData() const; bool hasIconData() const; bool hasCollisionBoxData() const; @@ -138,9 +140,4 @@ public: std::shared_ptr<std::vector<size_t>> featureSortOrder; }; -template <> -inline bool Bucket::is<SymbolBucket>() const { - return layerType == style::LayerType::Symbol; -} - } // namespace mbgl |