diff options
Diffstat (limited to 'platform/default/src/mbgl/gl')
-rw-r--r-- | platform/default/src/mbgl/gl/headless_backend.cpp | 4 | ||||
-rw-r--r-- | platform/default/src/mbgl/gl/headless_frontend.cpp | 24 |
2 files changed, 19 insertions, 9 deletions
diff --git a/platform/default/src/mbgl/gl/headless_backend.cpp b/platform/default/src/mbgl/gl/headless_backend.cpp index cbf451d80b..7362adcb9e 100644 --- a/platform/default/src/mbgl/gl/headless_backend.cpp +++ b/platform/default/src/mbgl/gl/headless_backend.cpp @@ -31,8 +31,8 @@ public: gl::Framebuffer framebuffer; }; -HeadlessBackend::HeadlessBackend(Size size_) - : mbgl::gfx::Renderable(size_, nullptr) { +HeadlessBackend::HeadlessBackend(const Size size_, const gfx::ContextMode contextMode_) + : mbgl::gl::RendererBackend(contextMode_), mbgl::gfx::Renderable(size_, nullptr) { } HeadlessBackend::~HeadlessBackend() { diff --git a/platform/default/src/mbgl/gl/headless_frontend.cpp b/platform/default/src/mbgl/gl/headless_frontend.cpp index 406c197904..7e56996f63 100644 --- a/platform/default/src/mbgl/gl/headless_frontend.cpp +++ b/platform/default/src/mbgl/gl/headless_frontend.cpp @@ -9,15 +9,25 @@ namespace mbgl { -HeadlessFrontend::HeadlessFrontend(float pixelRatio_, Scheduler& scheduler, const optional<std::string> programCacheDir, GLContextMode mode, const optional<std::string> localFontFamily) - : HeadlessFrontend({ 256, 256 }, pixelRatio_, scheduler, programCacheDir, mode, localFontFamily) { -} - -HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, Scheduler& scheduler, const optional<std::string> programCacheDir, GLContextMode mode, const optional<std::string> localFontFamily) +HeadlessFrontend::HeadlessFrontend(float pixelRatio_, + Scheduler& scheduler, + const optional<std::string> programCacheDir, + const gfx::ContextMode contextMode, + const optional<std::string> localFontFamily) + : HeadlessFrontend( + { 256, 256 }, pixelRatio_, scheduler, programCacheDir, contextMode, localFontFamily) { +} + +HeadlessFrontend::HeadlessFrontend(Size size_, + float pixelRatio_, + Scheduler& scheduler, + const optional<std::string> programCacheDir, + const gfx::ContextMode contextMode, + const optional<std::string> localFontFamily) : size(size_), pixelRatio(pixelRatio_), backend({ static_cast<uint32_t>(size.width * pixelRatio), - static_cast<uint32_t>(size.height * pixelRatio) }), + static_cast<uint32_t>(size.height * pixelRatio) }, contextMode), asyncInvalidate([this] { if (renderer && updateParameters) { gfx::BackendScope guard { backend }; @@ -30,7 +40,7 @@ HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, Scheduler& sch renderer->render(*updateParameters_); } }), - renderer(std::make_unique<Renderer>(backend, pixelRatio, scheduler, mode, programCacheDir, localFontFamily)) { + renderer(std::make_unique<Renderer>(backend, pixelRatio, scheduler, programCacheDir, localFontFamily)) { } HeadlessFrontend::~HeadlessFrontend() = default; |