From 06f1dc48a2fb317979ab48ce323115be5bd48f16 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 14 Feb 2019 16:56:17 +0200 Subject: [core] Make the BackgroundScheduler a singleton - Do not carry it over everywhere as parameter, it is a shared instance anyway and the lifecycle is pretty much the app lifecycle from the moment we instantiate a map. - Rename to BackgroundScheduler because it is a Scheduler that will do tasks in the background, we don't make assumptions if it is a thread pool or a single thread. - Most importantly, remove the dependency from `core` on `platform`. --- test/gl/context.test.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'test/gl') diff --git a/test/gl/context.test.cpp b/test/gl/context.test.cpp index b8fe895c44..756f2c58d4 100644 --- a/test/gl/context.test.cpp +++ b/test/gl/context.test.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -88,11 +87,9 @@ struct Buffer { TEST(GLContextMode, Shared) { util::RunLoop loop; - ThreadPool threadPool(4); + HeadlessFrontend frontend { 1, {}, gfx::ContextMode::Shared }; - HeadlessFrontend frontend { 1, threadPool, {}, gfx::ContextMode::Shared }; - - Map map(frontend, MapObserver::nullObserver(), threadPool, + Map map(frontend, MapObserver::nullObserver(), MapOptions().withMapMode(MapMode::Static).withSize(frontend.getSize()), ResourceOptions().withCachePath(":memory:").withAssetPath("test/fixtures/api/assets")); map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json")); -- cgit v1.2.1