From e2e3d949c79481dead2baff758b147a2c8f99ed0 Mon Sep 17 00:00:00 2001 From: reuk Date: Wed, 23 Oct 2024 19:17:33 +0100 Subject: [PATCH] OpenGL: Use C++ thread_local instead of JUCE ThreadLocal --- modules/juce_opengl/opengl/juce_OpenGLContext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp index b548ffb567..8a4583f2b2 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp @@ -1351,16 +1351,16 @@ OpenGLContext* OpenGLContext::getContextAttachedTo (Component& c) noexcept return nullptr; } -static ThreadLocalValue currentThreadActiveContext; +thread_local OpenGLContext* currentThreadActiveContext = nullptr; OpenGLContext* OpenGLContext::getCurrentContext() { - return currentThreadActiveContext.get(); + return currentThreadActiveContext; } bool OpenGLContext::makeActive() const noexcept { - auto& current = currentThreadActiveContext.get(); + auto& current = currentThreadActiveContext; if (nativeContext != nullptr && nativeContext->makeActive()) { @@ -1380,7 +1380,7 @@ bool OpenGLContext::isActive() const noexcept void OpenGLContext::deactivateCurrentContext() { NativeContext::deactivateCurrentContext(); - currentThreadActiveContext.get() = nullptr; + currentThreadActiveContext = nullptr; } void OpenGLContext::triggerRepaint()