From 92252849c1a2ddf7887d1908841fa3c90dd59766 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 1 Jun 2017 10:30:49 -0700
Subject: [core] Per-bucket glyph atlases

---
 test/tile/annotation_tile.test.cpp | 6 +++---
 test/tile/geojson_tile.test.cpp    | 6 +++---
 test/tile/raster_tile.test.cpp     | 6 +++---
 test/tile/vector_tile.test.cpp     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'test/tile')

diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp
index 927799b26d..168dbf5292 100644
--- a/test/tile/annotation_tile.test.cpp
+++ b/test/tile/annotation_tile.test.cpp
@@ -13,7 +13,7 @@
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/annotation/annotation_tile.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/text/glyph_atlas.hpp>
+#include <mbgl/text/glyph_manager.hpp>
 
 #include <memory>
 
@@ -28,7 +28,7 @@ public:
     AnnotationManager annotationManager;
     RenderStyle style { threadPool, fileSource };
     SpriteAtlas spriteAtlas;
-    GlyphAtlas glyphAtlas { { 512, 512, }, fileSource };
+    GlyphManager glyphManager { fileSource };
 
     TileParameters tileParameters {
         1.0,
@@ -39,7 +39,7 @@ public:
         MapMode::Continuous,
         annotationManager,
         spriteAtlas,
-        glyphAtlas
+        glyphManager
     };
 };
 
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index 92068d5e43..9a9fe9a78f 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -11,7 +11,7 @@
 #include <mbgl/style/layers/circle_layer.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/text/glyph_atlas.hpp>
+#include <mbgl/text/glyph_manager.hpp>
 
 #include <memory>
 
@@ -26,7 +26,7 @@ public:
     ThreadPool threadPool { 1 };
     AnnotationManager annotationManager;
     SpriteAtlas spriteAtlas;
-    GlyphAtlas glyphAtlas { { 512, 512, }, fileSource };
+    GlyphManager glyphManager { fileSource };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
     TileParameters tileParameters {
@@ -38,7 +38,7 @@ public:
         MapMode::Continuous,
         annotationManager,
         spriteAtlas,
-        glyphAtlas
+        glyphManager
     };
 };
 
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index 1bd35700b3..ba296c0360 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -10,7 +10,7 @@
 #include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/renderer/buckets/raster_bucket.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/text/glyph_atlas.hpp>
+#include <mbgl/text/glyph_manager.hpp>
 
 using namespace mbgl;
 
@@ -22,7 +22,7 @@ public:
     ThreadPool threadPool { 1 };
     AnnotationManager annotationManager;
     SpriteAtlas spriteAtlas;
-    GlyphAtlas glyphAtlas { { 512, 512, }, fileSource };
+    GlyphManager glyphManager { fileSource };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
     TileParameters tileParameters {
@@ -34,7 +34,7 @@ public:
         MapMode::Continuous,
         annotationManager,
         spriteAtlas,
-        glyphAtlas
+        glyphManager
     };
 };
 
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index a44eeb9001..e1a1635bd3 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -14,7 +14,7 @@
 #include <mbgl/geometry/feature_index.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/text/glyph_atlas.hpp>
+#include <mbgl/text/glyph_manager.hpp>
 
 #include <memory>
 
@@ -28,7 +28,7 @@ public:
     ThreadPool threadPool { 1 };
     AnnotationManager annotationManager;
     SpriteAtlas spriteAtlas;
-    GlyphAtlas glyphAtlas { { 512, 512, }, fileSource };
+    GlyphManager glyphManager { fileSource };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
     TileParameters tileParameters {
@@ -40,7 +40,7 @@ public:
         MapMode::Continuous,
         annotationManager,
         spriteAtlas,
-        glyphAtlas
+        glyphManager
     };
 };
 
-- 
cgit v1.2.1