mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Return nullptr when sf::Context::getFunction is called on Windows without an active context

Browse Source 
This converts termination in Debug and a SEGFAULT in Release builds
into defined behavior.
This commit is contained in:
Chris Thrasher 2024-04-02 18:09:10 -06:00
parent 49cf5058e5
commit d00ab43ea6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/SFML/Window/Context.hpp
View File

@ -131,6 +131,9 @@ public:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Get the address of an OpenGL function /// \brief Get the address of an OpenGL function
/// ///
/// On Windows when not using OpenGL ES, a context must be
/// active for this function to succeed.
///
/// \param name Name of the function to get the address of /// \param name Name of the function to get the address of
/// ///
/// \return Address of the OpenGL function, 0 on failure /// \return Address of the OpenGL function, 0 on failure

4
src/SFML/Window/Win32/WglContext.cpp
View File

@ -203,8 +203,8 @@ WglContext::~WglContext()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
GlFunctionPointer WglContext::getFunction(const char* name) GlFunctionPointer WglContext::getFunction(const char* name)
{ {
assert(WglContextImpl::currentContext != nullptr && if (WglContextImpl::currentContext == nullptr)
"Current WGL context cannot be null. Call WglContext::makeCurrent() to initialize it."); return nullptr;
// If we are using the generic GDI implementation, skip to loading directly from OpenGL32.dll since it doesn't support extensions // If we are using the generic GDI implementation, skip to loading directly from OpenGL32.dll since it doesn't support extensions
if (!WglContextImpl::currentContext->m_isGeneric) if (!WglContextImpl::currentContext->m_isGeneric)