[benchmark] rendering interface changes

mapbox · Jun 29, 2017 · d6e80ba · d6e80ba
1 parent 13bb428
commit d6e80ba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/benchmark/api/query.benchmark.cpp b/benchmark/api/query.benchmark.cpp
@@ -6,6 +6,7 @@
 #include <mbgl/gl/headless_backend.hpp>
 #include <mbgl/gl/offscreen_view.hpp>
 #include <mbgl/util/default_thread_pool.hpp>
+#include <mbgl/renderer/async_renderer_frontend.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/image.hpp>
 #include <mbgl/storage/default_file_source.hpp>
@@ -38,7 +39,7 @@ class QueryBenchmark {
     OffscreenView view{ backend.getContext(), { 1000, 1000 } };
     DefaultFileSource fileSource{ "benchmark/fixtures/api/cache.db", "." };
     ThreadPool threadPool{ 4 };
-    Map map{ backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still };
+    Map map { std::make_unique<AsyncRendererFrontend>(backend, view), MapObserver::nullObserver(), view.getSize(), 1, fileSource, threadPool, MapMode::Still };
     ScreenBox box{{ 0, 0 }, { 1000, 1000 }};
 };
 

diff --git a/benchmark/src/mbgl/benchmark/util.cpp b/benchmark/src/mbgl/benchmark/util.cpp
@@ -11,7 +11,7 @@ namespace benchmark {
 
 void render(Map& map, OffscreenView& view) {
     PremultipliedImage result;
-    map.renderStill(view, [&](std::exception_ptr) {
+    map.renderStill([&](std::exception_ptr) {
         result = view.readStillImage();
     });
 

diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake
@@ -1,4 +1,6 @@
 add_executable(mbgl-benchmark
+    platform/default/mbgl/renderer/async_renderer_frontend.cpp
+    platform/default/mbgl/renderer/async_renderer_frontend.hpp
     ${MBGL_BENCHMARK_FILES}
 )