diff options
Diffstat (limited to 'platform/default')
-rw-r--r-- | platform/default/mbgl/gl/headless_backend.cpp | 4 | ||||
-rw-r--r-- | platform/default/mbgl/gl/headless_backend.hpp | 1 | ||||
-rw-r--r-- | platform/default/mbgl/gl/headless_display.hpp | 16 |
3 files changed, 15 insertions, 6 deletions
diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp index e17e8f5c11..9076be4cbb 100644 --- a/platform/default/mbgl/gl/headless_backend.cpp +++ b/platform/default/mbgl/gl/headless_backend.cpp @@ -11,10 +11,6 @@ namespace mbgl { HeadlessBackend::HeadlessBackend() = default; -HeadlessBackend::HeadlessBackend(std::shared_ptr<HeadlessDisplay> display_) - : display(std::move(display_)) { -} - HeadlessBackend::~HeadlessBackend() { BackendScope guard { *this, getScopeType() }; context.reset(); diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp index 133c2096d9..5f39eb9f00 100644 --- a/platform/default/mbgl/gl/headless_backend.hpp +++ b/platform/default/mbgl/gl/headless_backend.hpp @@ -12,7 +12,6 @@ class HeadlessDisplay; class HeadlessBackend : public RendererBackend { public: HeadlessBackend(); - HeadlessBackend(std::shared_ptr<HeadlessDisplay>); ~HeadlessBackend() override; void updateAssumedState() override; diff --git a/platform/default/mbgl/gl/headless_display.hpp b/platform/default/mbgl/gl/headless_display.hpp index a5c95085b8..8c294655e5 100644 --- a/platform/default/mbgl/gl/headless_display.hpp +++ b/platform/default/mbgl/gl/headless_display.hpp @@ -6,13 +6,27 @@ namespace mbgl { class HeadlessDisplay { public: - HeadlessDisplay(); + static std::shared_ptr<HeadlessDisplay> create() { + static std::weak_ptr<HeadlessDisplay> instance; + + auto shared = instance.lock(); + + if (!shared) { + instance = shared = std::shared_ptr<HeadlessDisplay>(new HeadlessDisplay()); + } + + return shared; + } + + ~HeadlessDisplay(); template <typename DisplayAttribute> DisplayAttribute attribute() const; private: + HeadlessDisplay(); + class Impl; std::unique_ptr<Impl> impl; }; |