From 2ae96ad6879a00eba0b9115590f58e3eb3cbd019 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 19 Mar 2020 17:21:21 +0200 Subject: [core] Introduce Renderer::clearData() instead of keepRenderData map options `Renderer::clearData()` is a better API than the removed `MapOptions::keepRenderData()`: - gives more flexibility to the client - similar to the existing `Renderer::reduceMemoryUse()` - the `MapOptions::keepRenderData()` API implementation could not handle the raise condition, which happened if the new still image request had come before all tiles from the previous requests were loaded. Co-authored-by: Dane Springmeyer --- render-test/runner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'render-test') diff --git a/render-test/runner.cpp b/render-test/runner.cpp index 4fc68d0a1a..de43e5ddd8 100644 --- a/render-test/runner.cpp +++ b/render-test/runner.cpp @@ -641,6 +641,7 @@ TestOperations getAfterOperations(const Manifest& manifest) { } void resetContext(const TestMetadata& metadata, TestContext& ctx) { + ctx.getFrontend().getRenderer()->clearData(); ctx.getFrontend().setSize(metadata.size); auto& map = ctx.getMap(); map.setSize(metadata.size); @@ -683,8 +684,7 @@ TestRunner::Impl::Impl(const TestMetadata& metadata, const mbgl::ResourceOptions .withMapMode(metadata.mapMode) .withSize(metadata.size) .withPixelRatio(metadata.pixelRatio) - .withCrossSourceCollisions(metadata.crossSourceCollisions) - .withKeepRenderData(metadata.mapMode != MapMode::Tile), + .withCrossSourceCollisions(metadata.crossSourceCollisions), resourceOptions) {} TestRunner::Impl::~Impl() {} -- cgit v1.2.1