diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-19 17:12:07 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-22 17:53:16 -0700 |
commit | 1f4144c65a2ff63182f04e34bfa2172cd8091aeb (patch) | |
tree | 7727477b54c03c0d391642691f072ca24a389115 | |
parent | bb4bf9a77933951f6a9778c5f79d116770661bc9 (diff) | |
download | qtlocation-mapboxgl-1f4144c65a2ff63182f04e34bfa2172cd8091aeb.tar.gz |
[core] Remove StyleLayer::isBackground()
-rw-r--r-- | src/mbgl/map/tile_worker.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/style_layer.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/style/style_layer.hpp | 3 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/mbgl/map/tile_worker.cpp b/src/mbgl/map/tile_worker.cpp index c4a38c923d..e1f93dc03a 100644 --- a/src/mbgl/map/tile_worker.cpp +++ b/src/mbgl/map/tile_worker.cpp @@ -79,7 +79,7 @@ void TileWorker::parseLayer(const StyleLayer& layer, const GeometryTile& geometr return; // Background is a special case. - if (layer.isBackground()) + if (layer.type == StyleLayerType::Background) return; if (!layer.bucket) { diff --git a/src/mbgl/style/style_layer.cpp b/src/mbgl/style/style_layer.cpp index e6b3ee5bd9..61de612171 100644 --- a/src/mbgl/style/style_layer.cpp +++ b/src/mbgl/style/style_layer.cpp @@ -29,10 +29,6 @@ std::unique_ptr<StyleLayer> StyleLayer::create(StyleLayerType type) { } } -bool StyleLayer::isBackground() const { - return type == StyleLayerType::Background; -} - bool StyleLayer::hasRenderPass(RenderPass pass) const { return bool(passes & pass); } diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp index d44b2ce7cc..febfb27fed 100644 --- a/src/mbgl/style/style_layer.hpp +++ b/src/mbgl/style/style_layer.hpp @@ -29,9 +29,6 @@ public: virtual ~StyleLayer() = default; - // Determines whether this layer is the background layer. - bool isBackground() const; - // Checks whether this layer needs to be rendered in the given render pass. bool hasRenderPass(RenderPass) const; |