diff options
| author | Chris Loer <chris.loer@gmail.com> | 2017-03-10 09:02:07 -0800 |
|---|---|---|
| committer | Chris Loer <chris.loer@gmail.com> | 2017-03-22 08:50:45 -0700 |
| commit | e90966a9373d7aa7908b4a6fe39fa6cf5230cbc0 (patch) | |
| tree | f75298824f64a157f6a6d69433bc653822c0a8e8 /src/mbgl/style/layers/symbol_layer_impl.hpp | |
| parent | 3c91b6b7de487993e75de552ba44249740644e42 (diff) | |
| download | qtlocation-mapboxgl-e90966a9373d7aa7908b4a6fe39fa6cf5230cbc0.tar.gz | |
[core] De-mutex GlyphAtlas.upstream/cloer_glyph_sanity_check
- Expose glyph information to workers via message interface.
- Symbol preparation for a tile now depends on all glyphs becoming
available before it can start.
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_impl.hpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer_impl.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_impl.hpp b/src/mbgl/style/layers/symbol_layer_impl.hpp index 1e9f05e4c7..16bd67a4d4 100644 --- a/src/mbgl/style/layers/symbol_layer_impl.hpp +++ b/src/mbgl/style/layers/symbol_layer_impl.hpp @@ -1,5 +1,6 @@ #pragma once +#include <mbgl/text/glyph.hpp> #include <mbgl/util/variant.hpp> #include <mbgl/style/layer_impl.hpp> #include <mbgl/style/layers/symbol_layer.hpp> @@ -67,7 +68,7 @@ public: std::unique_ptr<Bucket> createBucket(const BucketParameters&, const std::vector<const Layer*>&) const override; std::unique_ptr<SymbolLayout> createLayout(const BucketParameters&, const std::vector<const Layer*>&, - const GeometryTileLayer&) const; + const GeometryTileLayer&, GlyphDependencies&) const; IconPaintProperties::Evaluated iconPaintProperties() const; TextPaintProperties::Evaluated textPaintProperties() const; |