diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-07-09 11:26:45 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-07-16 19:38:39 +0300 |
| commit | a75cc8c06b8d931b3b85dd9ac6d852f84b06e5b2 (patch) | |
| tree | d22f8b7ad6f93ccc5a2136ebbd0e797a5134d761 /src/mbgl/style | |
| parent | c6e58515fcd83a49d8633dc769e1ad1e69074653 (diff) | |
| download | qtlocation-mapboxgl-a75cc8c06b8d931b3b85dd9ac6d852f84b06e5b2.tar.gz | |
Make Glyph requests from the Map Thread
Now the requests are bound to the Map Thread loop and
we can cancel it quickly when shutting down or changing
style.
Previously requests were made by the workers and we would
have to wait them to finish because workers are destroyed
before the GlyphStore. This was giving the impression that
the application was frozen (in fact it was, momentarily).
Diffstat (limited to 'src/mbgl/style')
| -rw-r--r-- | src/mbgl/style/style.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 9945924082..5f92bb2664 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -22,9 +22,9 @@ namespace mbgl { -Style::Style(MapData& data_, uv_loop_t* loop) +Style::Style(MapData& data_, uv_loop_t*) : data(data_), - glyphStore(std::make_unique<GlyphStore>(loop)), + glyphStore(std::make_unique<GlyphStore>()), glyphAtlas(std::make_unique<GlyphAtlas>(1024, 1024)), spriteStore(std::make_unique<SpriteStore>()), spriteAtlas(std::make_unique<SpriteAtlas>(512, 512, data.pixelRatio, *spriteStore)), |