Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 'std::optional' in 'transientContext'

Browse Source
This commit is contained in:
Vittorio Romeo 2023-03-15 01:35:07 +01:00 committed by Chris Thrasher
parent 33e96657b7
commit 641cf54cc3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SFML/Window/GlContext.cpp
View File

@ -203,7 +203,7 @@ struct TransientContext
{ {
if (resourceCount == 0) if (resourceCount == 0)
{ {
context = std::make_unique<sf::Context>(); context.emplace();
} }
else if (!currentContext) else if (!currentContext)
{ {
@ -239,14 +239,14 @@ struct TransientContext
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
unsigned int referenceCount{}; unsigned int referenceCount{};
std::unique_ptr<sf::Context> context; std::optional<sf::Context> context;
std::optional<std::lock_guard<std::recursive_mutex>> sharedContextLock; std::optional<std::lock_guard<std::recursive_mutex>> sharedContextLock;
bool useSharedContext{}; bool useSharedContext{};
}; };
// This per-thread variable tracks if and how a transient // This per-thread variable tracks if and how a transient
// context is currently being used on the current thread // context is currently being used on the current thread
thread_local std::unique_ptr<TransientContext> transientContext; thread_local std::optional<TransientContext> transientContext;
// Supported OpenGL extensions // Supported OpenGL extensions
std::vector<std::string> extensions; std::vector<std::string> extensions;
@ -408,8 +408,8 @@ void GlContext::acquireTransientContext()
// If this is the first TransientContextLock on this thread // If this is the first TransientContextLock on this thread
// construct the state object // construct the state object
if (!transientContext) if (!transientContext.has_value())
transientContext = std::make_unique<TransientContext>(); transientContext.emplace();
// Increase the reference count // Increase the reference count
++transientContext->referenceCount; ++transientContext->referenceCount;
@ -426,7 +426,7 @@ void GlContext::releaseTransientContext()
std::lock_guard lock(mutex); std::lock_guard lock(mutex);
// Make sure a matching acquireTransientContext() was called // Make sure a matching acquireTransientContext() was called
assert(transientContext); assert(transientContext.has_value());
// Decrease the reference count // Decrease the reference count
--transientContext->referenceCount; --transientContext->referenceCount;