1 files changed, 23 insertions, 4 deletions
diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp
index 5f9626bc99..8393fd130d 100644
--- a/test/gl/bucket.test.cpp
+++ b/test/gl/bucket.test.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/test/util.hpp>
 #include <mbgl/test/stub_geometry_tile_feature.hpp>
 
+#include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/renderer/buckets/circle_bucket.hpp>
 #include <mbgl/renderer/buckets/fill_bucket.hpp>
 #include <mbgl/renderer/buckets/line_bucket.hpp>
@@ -9,6 +10,7 @@
 #include <mbgl/renderer/bucket_parameters.hpp>
 #include <mbgl/style/layers/symbol_layer_properties.hpp>
 #include <mbgl/gl/context.hpp>
+#include <mbgl/gl/headless_backend.hpp>
 
 #include <mbgl/map/mode.hpp>
 
@@ -41,8 +43,11 @@ PropertyMap properties;
 } // namespace
 
 TEST(Buckets, CircleBucket) {
+    HeadlessBackend backend({ 512, 256 });
+    BackendScope scope { backend };
+
     gl::Context context;
-    CircleBucket bucket { { {0, 0, 0}, MapMode::Still, 1.0 }, {} };
+    CircleBucket bucket { { {0, 0, 0}, MapMode::Static, 1.0 }, {} };
     ASSERT_FALSE(bucket.hasData());
     ASSERT_FALSE(bucket.needsUpload());
 
@@ -57,8 +62,11 @@ TEST(Buckets, CircleBucket) {
 }
 
 TEST(Buckets, FillBucket) {
+    HeadlessBackend backend({ 512, 256 });
+    BackendScope scope { backend };
+
     gl::Context context;
-    FillBucket bucket { { {0, 0, 0}, MapMode::Still, 1.0 }, {} };
+    FillBucket bucket { { {0, 0, 0}, MapMode::Static, 1.0 }, {} };
     ASSERT_FALSE(bucket.hasData());
     ASSERT_FALSE(bucket.needsUpload());
 
@@ -72,8 +80,11 @@ TEST(Buckets, FillBucket) {
 }
 
 TEST(Buckets, LineBucket) {
+    HeadlessBackend backend({ 512, 256 });
+    BackendScope scope { backend };
+
     gl::Context context;
-    LineBucket bucket { { {0, 0, 0}, MapMode::Still, 1.0 }, {}, {} };
+    LineBucket bucket { { {0, 0, 0}, MapMode::Static, 1.0 }, {}, {} };
     ASSERT_FALSE(bucket.hasData());
     ASSERT_FALSE(bucket.needsUpload());
 
@@ -92,12 +103,17 @@ TEST(Buckets, LineBucket) {
 }
 
 TEST(Buckets, SymbolBucket) {
+    HeadlessBackend backend({ 512, 256 });
+    BackendScope scope { backend };
+
     style::SymbolLayoutProperties::PossiblyEvaluated layout;
     bool sdfIcons = false;
     bool iconsNeedLinear = false;
+    bool sortFeaturesByY = false;
+    std::vector<SymbolInstance> symbolInstances;
 
     gl::Context context;
-    SymbolBucket bucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear };
+    SymbolBucket bucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, std::move(symbolInstances) };
     ASSERT_FALSE(bucket.hasIconData());
     ASSERT_FALSE(bucket.hasTextData());
     ASSERT_FALSE(bucket.hasCollisionBoxData());
@@ -120,6 +136,9 @@ TEST(Buckets, SymbolBucket) {
 }
 
 TEST(Buckets, RasterBucket) {
+    HeadlessBackend backend({ 512, 256 });
+    BackendScope scope { backend };
+
     gl::Context context;
     PremultipliedImage rgba({ 1, 1 });