From 1f4144c65a2ff63182f04e34bfa2172cd8091aeb Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 19 Oct 2015 17:12:07 -0700 Subject: [core] Remove StyleLayer::isBackground() --- src/mbgl/map/tile_worker.cpp | 2 +- src/mbgl/style/style_layer.cpp | 4 ---- src/mbgl/style/style_layer.hpp | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src') 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::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; -- cgit v1.2.1