diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-02-27 18:33:16 +0100 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-23 14:50:11 -0700 |
| commit | 234384ece9c70f2a803ed2b1d1eb55b248ec43d1 (patch) | |
| tree | a69fa3e64179667d79546f4f3d1b33f041e4ea22 /platform/default/mbgl/gl | |
| parent | 8e5214144ec4f3a4fb40b7a7e4d8f09fd10dbb78 (diff) | |
| download | qtlocation-mapboxgl-234384ece9c70f2a803ed2b1d1eb55b248ec43d1.tar.gz | |
[core] Move OpenGL extension initialization to Backend
Diffstat (limited to 'platform/default/mbgl/gl')
| -rw-r--r-- | platform/default/mbgl/gl/headless_backend.cpp | 5 | ||||
| -rw-r--r-- | platform/default/mbgl/gl/headless_backend.hpp | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp index 6ae19356fb..798c8fe680 100644 --- a/platform/default/mbgl/gl/headless_backend.cpp +++ b/platform/default/mbgl/gl/headless_backend.cpp @@ -33,11 +33,6 @@ void HeadlessBackend::activate() { assert(hasContext()); impl->activateContext(); - - if (!extensionsLoaded) { - gl::InitializeExtensions(initializeExtension); - extensionsLoaded = true; - } } void HeadlessBackend::deactivate() { diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp index 63e3cec9ee..7e1749a253 100644 --- a/platform/default/mbgl/gl/headless_backend.hpp +++ b/platform/default/mbgl/gl/headless_backend.hpp @@ -1,7 +1,5 @@ #pragma once -#include <mbgl/gl/extension.hpp> - #include <mbgl/map/backend.hpp> #include <memory> @@ -27,7 +25,7 @@ public: private: // Implementation specific functions - static gl::glProc initializeExtension(const char*); + gl::ProcAddress initializeExtension(const char*) override; void activate() override; void deactivate() override; @@ -40,7 +38,6 @@ private: std::unique_ptr<Impl> impl; std::shared_ptr<HeadlessDisplay> display; - bool extensionsLoaded = false; bool active = false; }; |