From 65f94bb91346b1fb20c93bf59287468df249e2ec Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Tue, 25 Jul 2017 11:25:33 +0300 Subject: [benchmark] manage backendscope in renderer frontend --- benchmark/api/query.benchmark.cpp | 2 +- benchmark/api/render.benchmark.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/benchmark/api/query.benchmark.cpp b/benchmark/api/query.benchmark.cpp index db8e597dd3..8b96d02163 100644 --- a/benchmark/api/query.benchmark.cpp +++ b/benchmark/api/query.benchmark.cpp @@ -40,7 +40,7 @@ public: OffscreenView view{ backend.getContext(), { 1000, 1000 } }; DefaultFileSource fileSource{ "benchmark/fixtures/api/cache.db", "." }; ThreadPool threadPool{ 4 }; - AsyncRendererFrontend rendererFrontend { std::make_unique(backend, 1, fileSource, threadPool), view }; + AsyncRendererFrontend rendererFrontend { std::make_unique(backend, 1, fileSource, threadPool), backend, view }; Map map { rendererFrontend, MapObserver::nullObserver(), view.getSize(), 1, fileSource, threadPool, MapMode::Still }; ScreenBox box{{ 0, 0 }, { 1000, 1000 }}; }; diff --git a/benchmark/api/render.benchmark.cpp b/benchmark/api/render.benchmark.cpp index 28e155358b..90667d4ed4 100644 --- a/benchmark/api/render.benchmark.cpp +++ b/benchmark/api/render.benchmark.cpp @@ -47,7 +47,7 @@ static void prepare(Map& map, optional json = {}) { static void API_renderStill_reuse_map(::benchmark::State& state) { RenderBenchmark bench; - AsyncRendererFrontend frontend { std::make_unique(bench.backend, 1, bench.fileSource, bench.threadPool), bench.view }; + AsyncRendererFrontend frontend { std::make_unique(bench.backend, 1, bench.fileSource, bench.threadPool), bench.backend, bench.view }; Map map { frontend, MapObserver::nullObserver(), bench.view.getSize(), 1, bench.fileSource, bench.threadPool, MapMode::Still }; prepare(map); @@ -58,7 +58,7 @@ static void API_renderStill_reuse_map(::benchmark::State& state) { static void API_renderStill_reuse_map_switch_styles(::benchmark::State& state) { RenderBenchmark bench; - AsyncRendererFrontend frontend { std::make_unique(bench.backend, 1, bench.fileSource, bench.threadPool), bench.view }; + AsyncRendererFrontend frontend { std::make_unique(bench.backend, 1, bench.fileSource, bench.threadPool), bench.backend, bench.view }; Map map { frontend, MapObserver::nullObserver(), bench.view.getSize(), 1, bench.fileSource, bench.threadPool, MapMode::Still }; while (state.KeepRunning()) { @@ -73,7 +73,7 @@ static void API_renderStill_recreate_map(::benchmark::State& state) { RenderBenchmark bench; while (state.KeepRunning()) { - AsyncRendererFrontend frontend { std::make_unique(bench.backend, 1, bench.fileSource, bench.threadPool), bench.view }; + AsyncRendererFrontend frontend { std::make_unique(bench.backend, 1, bench.fileSource, bench.threadPool), bench.backend, bench.view }; Map map { frontend, MapObserver::nullObserver(), bench.view.getSize(), 1, bench.fileSource, bench.threadPool, MapMode::Still }; prepare(map); mbgl::benchmark::render(map, bench.view); -- cgit v1.2.1