diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-17 11:14:08 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-20 12:04:21 -0800 |
commit | ed7844d08f3cffaba00cc974c4ab6b26c84dd98d (patch) | |
tree | ed2d489391ed537fd5be6982f9dbc105deaaaee5 /platform/default | |
parent | 694159c49ebc15e0d6e92addc31f65b623dbe1f9 (diff) | |
download | qtlocation-mapboxgl-ed7844d08f3cffaba00cc974c4ab6b26c84dd98d.tar.gz |
[core] Inline HeadlessBackend::{activate,deactivate,destroy}Context
HeadlessContext::destroyContext isn't even necessary; std::unique_ptr handles that automatically.
Diffstat (limited to 'platform/default')
-rw-r--r-- | platform/default/mbgl/gl/headless_backend.cpp | 22 | ||||
-rw-r--r-- | platform/default/mbgl/gl/headless_backend.hpp | 6 |
2 files changed, 4 insertions, 24 deletions
diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp index 0bfdf11c98..7ccf6d132b 100644 --- a/platform/default/mbgl/gl/headless_backend.cpp +++ b/platform/default/mbgl/gl/headless_backend.cpp @@ -18,7 +18,6 @@ HeadlessBackend::HeadlessBackend(std::shared_ptr<HeadlessDisplay> display_) HeadlessBackend::~HeadlessBackend() { deactivate(); - destroyContext(); } void HeadlessBackend::activate() { @@ -31,7 +30,8 @@ void HeadlessBackend::activate() { createContext(); } - activateContext(); + assert(hasContext()); + impl->activateContext(); if (!extensionsLoaded) { gl::InitializeExtensions(initializeExtension); @@ -40,7 +40,8 @@ void HeadlessBackend::activate() { } void HeadlessBackend::deactivate() { - deactivateContext(); + assert(hasContext()); + impl->deactivateContext(); active = false; } @@ -48,21 +49,6 @@ void HeadlessBackend::invalidate() { assert(false); } -void HeadlessBackend::destroyContext() { - assert(hasContext()); - impl.reset(); -} - -void HeadlessBackend::activateContext() { - assert(hasContext()); - impl->activateContext(); -} - -void HeadlessBackend::deactivateContext() { - assert(hasContext()); - impl->deactivateContext(); -} - void HeadlessBackend::notifyMapChange(MapChange change) { if (mapChangeCallback) { mapChangeCallback(change); diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp index da8c55e044..f566257522 100644 --- a/platform/default/mbgl/gl/headless_backend.hpp +++ b/platform/default/mbgl/gl/headless_backend.hpp @@ -39,12 +39,6 @@ private: void createContext(); -private: - void destroyContext(); - - void activateContext(); - void deactivateContext(); - std::unique_ptr<Impl> impl; std::shared_ptr<HeadlessDisplay> display; |