[default] headless_frontend - support program cache dir

This commit is contained in:
Ivo van Dongen
2017-08-22 16:31:28 +03:00
committed by Ivo van Dongen
parent abecfe2333
commit eba6d58312
2 changed files with 7 additions and 6 deletions

View File

@@ -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;

View File

@@ -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;