diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2017-08-22 16:31:28 +0300 |
|---|---|---|
| committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-08-30 17:18:37 +0300 |
| commit | eba6d58312d28b8e714928ecb9e02bad54455919 (patch) | |
| tree | 7a0040165775a0de76d402b85af89221f9a3d8ea | |
| parent | abecfe23333f3d8ecad4e766ab350a96b70eb56e (diff) | |
| download | qtlocation-mapboxgl-eba6d58312d28b8e714928ecb9e02bad54455919.tar.gz | |
[default] headless_frontend - support program cache dir
| -rw-r--r-- | platform/default/mbgl/gl/headless_frontend.cpp | 8 | ||||
| -rw-r--r-- | platform/default/mbgl/gl/headless_frontend.hpp | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/platform/default/mbgl/gl/headless_frontend.cpp b/platform/default/mbgl/gl/headless_frontend.cpp index ad03706be7..5d2932258a 100644 --- a/platform/default/mbgl/gl/headless_frontend.cpp +++ b/platform/default/mbgl/gl/headless_frontend.cpp @@ -5,11 +5,11 @@ namespace mbgl { -HeadlessFrontend::HeadlessFrontend(float pixelRatio_, FileSource& fileSource, Scheduler& scheduler) - : HeadlessFrontend({ 256, 256 }, pixelRatio_, fileSource, scheduler) { +HeadlessFrontend::HeadlessFrontend(float pixelRatio_, FileSource& fileSource, Scheduler& scheduler, const optional<std::string> programCacheDir) + : HeadlessFrontend({ 256, 256 }, pixelRatio_, fileSource, scheduler, programCacheDir) { } -HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, FileSource& fileSource, Scheduler& scheduler) +HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, FileSource& fileSource, Scheduler& scheduler, const optional<std::string> programCacheDir) : size(size_), pixelRatio(pixelRatio_), backend({ static_cast<uint32_t>(size.width * pixelRatio), @@ -20,7 +20,7 @@ HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, FileSource& fi renderer->render(*updateParameters); } }), - renderer(std::make_unique<Renderer>(backend, pixelRatio, fileSource, scheduler)) { + renderer(std::make_unique<Renderer>(backend, pixelRatio, fileSource, scheduler, GLContextMode::Unique, programCacheDir)) { } HeadlessFrontend::~HeadlessFrontend() = default; diff --git a/platform/default/mbgl/gl/headless_frontend.hpp b/platform/default/mbgl/gl/headless_frontend.hpp index 18d0d2527b..33503bc13b 100644 --- a/platform/default/mbgl/gl/headless_frontend.hpp +++ b/platform/default/mbgl/gl/headless_frontend.hpp @@ -3,6 +3,7 @@ #include <mbgl/renderer/renderer_frontend.hpp> #include <mbgl/gl/headless_backend.hpp> #include <mbgl/util/async_task.hpp> +#include <mbgl/util/optional.hpp> #include <memory> @@ -16,8 +17,8 @@ class Map; class HeadlessFrontend : public RendererFrontend { public: - HeadlessFrontend(float pixelRatio_, FileSource&, Scheduler&); - HeadlessFrontend(Size, float pixelRatio_, FileSource&, Scheduler&); + HeadlessFrontend(float pixelRatio_, FileSource&, Scheduler&, const optional<std::string> programCacheDir = {}); + HeadlessFrontend(Size, float pixelRatio_, FileSource&, Scheduler&, const optional<std::string> programCacheDir = {}); ~HeadlessFrontend() override; void reset() override; |