diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-15 15:40:35 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-19 09:40:43 -0700 |
| commit | 940124ff713a960d7f70071779dd37d07010fa80 (patch) | |
| tree | a89c129b9e972946ab29f05587381c45649a5d99 /src/mbgl/tile | |
| parent | 1014a503a22dc47e4e6ec3c37d034fd729873345 (diff) | |
| download | qtlocation-mapboxgl-940124ff713a960d7f70071779dd37d07010fa80.tar.gz | |
[core] Merge SpriteStore and SpriteAtlas
Diffstat (limited to 'src/mbgl/tile')
| -rw-r--r-- | src/mbgl/tile/geometry_tile.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/tile/geometry_tile_worker.cpp | 6 | ||||
| -rw-r--r-- | src/mbgl/tile/geometry_tile_worker.hpp | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index ed9d4a551b..36919517a2 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -27,7 +27,6 @@ GeometryTile::GeometryTile(const OverscaledTileID& id_, worker(parameters.workerScheduler, ActorRef<GeometryTile>(*this, mailbox), id_, - *parameters.style.spriteStore, *parameters.style.glyphAtlas, *parameters.style.glyphStore, obsolete, diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp index 35d15ae1fa..927cd0c2a1 100644 --- a/src/mbgl/tile/geometry_tile_worker.cpp +++ b/src/mbgl/tile/geometry_tile_worker.cpp @@ -6,7 +6,6 @@ #include <mbgl/style/bucket_parameters.hpp> #include <mbgl/style/layers/symbol_layer.hpp> #include <mbgl/style/layers/symbol_layer_impl.hpp> -#include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/geometry/glyph_atlas.hpp> #include <mbgl/renderer/symbol_bucket.hpp> #include <mbgl/platform/log.hpp> @@ -23,7 +22,6 @@ using namespace style; GeometryTileWorker::GeometryTileWorker(ActorRef<GeometryTileWorker> self_, ActorRef<GeometryTile> parent_, OverscaledTileID id_, - SpriteStore& spriteStore_, GlyphAtlas& glyphAtlas_, GlyphStore& glyphStore_, const std::atomic<bool>& obsolete_, @@ -31,7 +29,6 @@ GeometryTileWorker::GeometryTileWorker(ActorRef<GeometryTileWorker> self_, : self(std::move(self_)), parent(std::move(parent_)), id(std::move(id_)), - spriteStore(spriteStore_), glyphAtlas(glyphAtlas_), glyphStore(glyphStore_), obsolete(obsolete_), @@ -219,7 +216,6 @@ void GeometryTileWorker::redoLayout() { *geometryLayer, obsolete, reinterpret_cast<uintptr_t>(this), - spriteStore, glyphAtlas, glyphStore, *featureIndex, @@ -259,7 +255,7 @@ void GeometryTileWorker::attemptPlacement() { } if (symbolLayout->state == SymbolLayout::Pending) { - if (symbolLayout->canPrepare(glyphStore, spriteStore)) { + if (symbolLayout->canPrepare(glyphStore)) { symbolLayout->state = SymbolLayout::Prepared; symbolLayout->prepare(reinterpret_cast<uintptr_t>(this), glyphAtlas, diff --git a/src/mbgl/tile/geometry_tile_worker.hpp b/src/mbgl/tile/geometry_tile_worker.hpp index cc5e48f9b4..362021fa4f 100644 --- a/src/mbgl/tile/geometry_tile_worker.hpp +++ b/src/mbgl/tile/geometry_tile_worker.hpp @@ -14,7 +14,6 @@ namespace mbgl { class GeometryTile; class GeometryTileData; -class SpriteStore; class GlyphAtlas; class GlyphStore; class SymbolLayout; @@ -28,7 +27,6 @@ public: GeometryTileWorker(ActorRef<GeometryTileWorker> self, ActorRef<GeometryTile> parent, OverscaledTileID, - SpriteStore&, GlyphAtlas&, GlyphStore&, const std::atomic<bool>&, @@ -49,7 +47,6 @@ private: ActorRef<GeometryTile> parent; const OverscaledTileID id; - SpriteStore& spriteStore; GlyphAtlas& glyphAtlas; GlyphStore& glyphStore; const std::atomic<bool>& obsolete; |