fix(core): make headless OpenGL display singletons thread-safe (#4332)

This commit is contained in:
Taku Fukada
2026-07-14 04:56:09 +09:00
committed by GitHub
parent c58080b491
commit d4ae69d3bc
4 changed files with 13 additions and 18 deletions

View File

@@ -3,6 +3,7 @@
#include <mbgl/util/logging.hpp>
#include <cassert>
#include <memory>
#ifdef CI_BUILD
#include <chrono>
@@ -80,12 +81,9 @@ public:
}
static std::shared_ptr<const GLXDisplayConfig> create() {
static std::weak_ptr<const GLXDisplayConfig> instance;
auto shared = instance.lock();
if (!shared) {
instance = shared = std::make_shared<GLXDisplayConfig>(Key{});
}
return shared;
// C++11 magic static guarantees thread-safe one-shot initialization.
static const auto instance = std::make_shared<GLXDisplayConfig>(Key{});
return instance;
}
public: