diff options
-rw-r--r-- | src/mbgl/algorithm/update_renderables_impl.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/style.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/tile/tile_cache.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/tile/tile_data.hpp | 14 | ||||
-rw-r--r-- | src/mbgl/tile/vector_tile_data.cpp | 2 | ||||
-rw-r--r-- | test/algorithm/mock.hpp | 2 |
6 files changed, 11 insertions, 15 deletions
diff --git a/src/mbgl/algorithm/update_renderables_impl.hpp b/src/mbgl/algorithm/update_renderables_impl.hpp index 6ec944a85f..0f97801021 100644 --- a/src/mbgl/algorithm/update_renderables_impl.hpp +++ b/src/mbgl/algorithm/update_renderables_impl.hpp @@ -17,7 +17,7 @@ bool tryTile(const UnwrappedTileID& renderTileID, Renderables& renderables) { if (renderables.find(renderTileID) == renderables.end()) { const auto it = dataTiles.find(dataTileID); - if (it == dataTiles.end() || !it->second->isReady()) { + if (it == dataTiles.end() || !it->second->isRenderable()) { return false; } diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index c77d1b5a52..bc2a1d9a40 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -288,7 +288,7 @@ RenderData Style::getRenderData() const { for (auto& pair : source->getTiles()) { auto& tile = pair.second; - if (!tile.data.isReady()) { + if (!tile.data.isRenderable()) { continue; } diff --git a/src/mbgl/tile/tile_cache.cpp b/src/mbgl/tile/tile_cache.cpp index 15e8a38ce5..e012ef0b7e 100644 --- a/src/mbgl/tile/tile_cache.cpp +++ b/src/mbgl/tile/tile_cache.cpp @@ -18,7 +18,7 @@ void TileCache::setSize(size_t size_) { } void TileCache::add(const OverscaledTileID& key, std::unique_ptr<TileData> data) { - if (!data->isReady() || !size) { + if (!data->isRenderable() || !size) { return; } @@ -48,7 +48,7 @@ std::unique_ptr<TileData> TileCache::get(const OverscaledTileID& key) { data = std::move(it->second); tiles.erase(it); orderedKeys.remove(key); - assert(data->isReady()); + assert(data->isRenderable()); } return data; diff --git a/src/mbgl/tile/tile_data.hpp b/src/mbgl/tile/tile_data.hpp index 6552ad0f91..f8fbbf078c 100644 --- a/src/mbgl/tile/tile_data.hpp +++ b/src/mbgl/tile/tile_data.hpp @@ -66,13 +66,6 @@ public: static const char* StateToString(State); - // Tile data considered "Ready" can be used for rendering. Data in - // partial state is still waiting for network resources but can also - // be rendered, although layers will be missing. - inline static bool isReadyState(const State& state) { - return state == State::partial || state == State::parsed; - } - TileData(const OverscaledTileID&); virtual ~TileData(); @@ -91,8 +84,11 @@ public: const TransformState&, const optional<std::vector<std::string>>& layerIDs); - bool isReady() const { - return isReadyState(state); + // Tile data considered "Renderable" can be used for rendering. Data in + // partial state is still waiting for network resources but can also + // be rendered, although layers will be missing. + bool isRenderable() const { + return state == State::partial || state == State::parsed; } // Returns true when there's at least some data that we can render. diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp index 10b5bae182..a707d48822 100644 --- a/src/mbgl/tile/vector_tile_data.cpp +++ b/src/mbgl/tile/vector_tile_data.cpp @@ -53,7 +53,7 @@ VectorTileData::VectorTileData(const OverscaledTileID& id_, if (state == State::loading) { state = State::loaded; - } else if (isReady()) { + } else if (isRenderable()) { state = State::partial; } diff --git a/test/algorithm/mock.hpp b/test/algorithm/mock.hpp index 0faddcac7e..a1ee534f79 100644 --- a/test/algorithm/mock.hpp +++ b/test/algorithm/mock.hpp @@ -44,7 +44,7 @@ struct MockBucket {}; struct MockTileData { - bool isReady() { + bool isRenderable() { return ready; } |