diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-03-31 14:53:18 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2017-04-04 11:33:12 -0700 |
| commit | 5cdf838a387cae446dba500ac49a1c5524bf7949 (patch) | |
| tree | 3b438034a7842c36a7804096785fca1a6ad6fa80 /src/mbgl/style/style.cpp | |
| parent | 64beba3accb0f2088b2e01fad710f915c81d99c7 (diff) | |
| download | qtlocation-mapboxgl-5cdf838a387cae446dba500ac49a1c5524bf7949.tar.gz | |
[core] De-mutex GlyphAtlas and SpriteAtlas
- Expose glyph and icon information to workers via message interface.
- Glyph/SpriteAtlas track which tiles have outstanding requests
and send messages to them when glyphs/icons become available.
- Remove obsolete "updateSymbolDependentTiles" pathway
- Symbol preparation for a tile now depends on all glyphs becoming
available before it can start.
- Start tracking individual icons needed for a tile, although we don't
do anything with the information yet.
- Introduce typedef for GlyphID
Diffstat (limited to 'src/mbgl/style/style.cpp')
| -rw-r--r-- | src/mbgl/style/style.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 5f9983ae94..9640988402 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -274,12 +274,6 @@ void Style::updateTiles(const UpdateParameters& parameters) { } } -void Style::updateSymbolDependentTiles() { - for (const auto& source : sources) { - source->baseImpl->updateSymbolDependentTiles(); - } -} - void Style::relayout() { for (const auto& sourceID : updateBatch.sourceIDs) { Source* source = getSource(sourceID); @@ -575,7 +569,6 @@ void Style::setObserver(style::Observer* observer_) { void Style::onGlyphsLoaded(const FontStack& fontStack, const GlyphRange& glyphRange) { observer->onGlyphsLoaded(fontStack, glyphRange); - updateSymbolDependentTiles(); } void Style::onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRange, std::exception_ptr error) { @@ -626,7 +619,6 @@ void Style::onTileError(Source& source, const OverscaledTileID& tileID, std::exc void Style::onSpriteLoaded() { observer->onSpriteLoaded(); observer->onUpdate(Update::Repaint); // For *-pattern properties. - updateSymbolDependentTiles(); } void Style::onSpriteError(std::exception_ptr error) { |