[core] fold HeadlessDisplay into the headless RenderBackend implementation

1 files changed, 12 insertions, 17 deletions

diff --git a/platform/default/headless_backend_osmesa.cpp b/platform/default/headless_backend_osmesa.cpp
index 5042f5ed10..4cb0bfc5c4 100644
--- a/platform/default/headless_backend_osmesa.cpp
+++ b/platform/default/headless_backend_osmesa.cpp
@@ -8,10 +8,18 @@
 namespace mbgl {
 
 struct OSMesaImpl : public HeadlessBackend::Impl {
-    OSMesaImpl(OSMesaContext glContext_) : glContext(glContext_) {
+    OSMesaImpl() {
+#if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
+        glContext = OSMesaCreateContextExt(OSMESA_RGBA, 16, 0, 0, nullptr);
+#else
+        glContext = OSMesaCreateContext(OSMESA_RGBA, nullptr);
+#endif
+        if (glContext == nullptr) {
+            throw std::runtime_error("Error creating GL context object.");
+        }
     }
 
-    ~OSMesaImpl() {
+    ~OSMesaImpl() final {
         OSMesaDestroyContext(glContext);
     }
 
@@ -21,6 +29,7 @@ struct OSMesaImpl : public HeadlessBackend::Impl {
         }
     }
 
+private:
     OSMesaContext glContext = nullptr;
     GLubyte fakeBuffer = 0;
 };
@@ -29,23 +38,9 @@ gl::ProcAddress HeadlessBackend::initializeExtension(const char* name) {
     return OSMesaGetProcAddress(name);
 }
 
-bool HeadlessBackend::hasDisplay() {
-    return true;
-};
-
 void HeadlessBackend::createContext() {
     assert(!hasContext());
-
-#if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
-    OSMesaContext glContext = OSMesaCreateContextExt(OSMESA_RGBA, 16, 0, 0, nullptr);
-#else
-    OSMesaContext glContext = OSMesaCreateContext(OSMESA_RGBA, nullptr);
-#endif
-    if (glContext == nullptr) {
-        throw std::runtime_error("Error creating GL context object.");
-    }
-
-    impl.reset(new OSMesaImpl(glContext));
+    impl = std::make_unique<OSMesaImpl>();
 }
 
 } // namespace mbgl