tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: protect WGLDisplayConfig from being created multiple times by different threads (#1399)

Browse Source
This commit is contained in:
tdcosta100
2023-09-03 18:15:23 -03:00
committed by GitHub
parent 11d7206b9d
commit 7e50795ab2
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
platform/windows/src/headless_backend_wgl.cpp
View File

@@ -196,15 +196,10 @@ public:
~WGLDisplayConfig() { UnregisterClassA(renderingWindowClass.lpszClassName, renderingWindowClass.hInstance); }
static std::shared_ptr<WGLDisplayConfig> create() {
static std::weak_ptr<WGLDisplayConfig> instance;
auto shared = instance.lock();
static WGLDisplayConfig& create() {
static WGLDisplayConfig instance = WGLDisplayConfig{Key{}};
if (!shared) {
instance = shared = std::make_shared<WGLDisplayConfig>(Key{});
}
return shared;
return instance;
}
public:
@@ -219,7 +214,7 @@ public:
class WGLBackendImpl final : public HeadlessBackend::Impl {
private:
std::shared_ptr<WGLDisplayConfig> wglDisplayConfig = WGLDisplayConfig::create();
WGLDisplayConfig& wglDisplayConfig = WGLDisplayConfig::create();
HWND renderingWindowHandle = NULL;
HDC renderingWindowDeviceContext = NULL;
@@ -230,7 +225,7 @@ private:
MSG message;
renderingWindowHandle = CreateWindowExA(0,
wglDisplayConfig->renderingWindowClass.lpszClassName,
wglDisplayConfig.renderingWindowClass.lpszClassName,
"WGL Render Window",
WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
0,
@@ -239,7 +234,7 @@ private:
1,
NULL,
NULL,
wglDisplayConfig->renderingWindowClass.hInstance,
wglDisplayConfig.renderingWindowClass.hInstance,
NULL);
if (!renderingWindowHandle) {
@@ -330,7 +325,7 @@ private:
throw std::runtime_error("Failed to set pixel format for context");
}
if (wglDisplayConfig->ARB_create_context) {
if (wglDisplayConfig.ARB_create_context) {
renderingWindowRenderingContext = mbgl::platform::wglCreateContextAttribsARB(
renderingWindowDeviceContext,
NULL,