From f77af317c4e33902eedd2bf8c0527dacb1910522 Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Thu, 6 Jun 2019 16:03:29 +0300
Subject: [core] Update algorithm::updateTileMasks tests

---
 benchmark/parse/tile_mask.benchmark.cpp | 34 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'benchmark')

diff --git a/benchmark/parse/tile_mask.benchmark.cpp b/benchmark/parse/tile_mask.benchmark.cpp
index 79ab685c28..a31e0b5eab 100644
--- a/benchmark/parse/tile_mask.benchmark.cpp
+++ b/benchmark/parse/tile_mask.benchmark.cpp
@@ -4,34 +4,32 @@
 
 using namespace mbgl;
 
-class MaskedRenderable {
+class FakeTile {
 public:
-    MaskedRenderable(const UnwrappedTileID& id_, TileMask&& mask_)
-        : id(id_), mask(std::move(mask_)) {
+    FakeTile(TileMask mask_)
+        : mask(std::move(mask_)) {
     }
-
-    UnwrappedTileID id;
-    TileMask mask;
-    bool used = true;
-
-    void setMask(TileMask&& mask_) {
+    void setMask(TileMask mask_) {
         mask = std::move(mask_);
     }
+
+    const bool usedByRenderedLayers = true;
+    TileMask mask;
 };
 
 static void TileMaskGeneration(benchmark::State& state) {
-    std::vector<MaskedRenderable> renderables = {
-        MaskedRenderable{ UnwrappedTileID{ 12, 1028, 1456 }, {} },
-        MaskedRenderable{ UnwrappedTileID{ 13, 2056, 2912 }, {} },
-        MaskedRenderable{ UnwrappedTileID{ 13, 2056, 2913 }, {} },
-        MaskedRenderable{ UnwrappedTileID{ 14, 4112, 5824 }, {} },
-        MaskedRenderable{ UnwrappedTileID{ 14, 4112, 5827 }, {} },
-        MaskedRenderable{ UnwrappedTileID{ 14, 4114, 5824 }, {} },
-        MaskedRenderable{ UnwrappedTileID{ 14, 4114, 5825 }, {} },
+    std::map<UnwrappedTileID, FakeTile> renderables = {
+        { UnwrappedTileID{ 12, 1028, 1456 }, TileMask{} },
+        { UnwrappedTileID{ 13, 2056, 2912 }, TileMask{} },
+        { UnwrappedTileID{ 13, 2056, 2913 }, TileMask{} },
+        { UnwrappedTileID{ 14, 4112, 5824 }, TileMask{} },
+        { UnwrappedTileID{ 14, 4112, 5827 }, TileMask{} },
+        { UnwrappedTileID{ 14, 4114, 5824 }, TileMask{} },
+        { UnwrappedTileID{ 14, 4114, 5825 }, TileMask{} },
     };
 
     while (state.KeepRunning()) {
-        algorithm::updateTileMasks<MaskedRenderable>({ renderables.begin(), renderables.end() });
+        algorithm::updateTileMasks(renderables);
     }
 }
 
-- 
cgit v1.2.1