diff options
author | James Cowgill <jcowgill@debian.org> | 2018-05-15 13:58:15 +0100 |
---|---|---|
committer | James Cowgill <jcowgill@debian.org> | 2018-05-15 13:58:15 +0100 |
commit | b175eed3ca950204c9b52fdcebc897f337b7bf19 (patch) | |
tree | 0f50d921750c957f11bda18abc83f9228d010902 /src/SFML/Window/GlResource.cpp | |
parent | 31394fcd65a10f2d2c51c3d27afff5367bded901 (diff) |
New upstream version 2.5.0+dfsg
Diffstat (limited to 'src/SFML/Window/GlResource.cpp')
-rw-r--r-- | src/SFML/Window/GlResource.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/SFML/Window/GlResource.cpp b/src/SFML/Window/GlResource.cpp index 546ed35..64fc88c 100644 --- a/src/SFML/Window/GlResource.cpp +++ b/src/SFML/Window/GlResource.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2017 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2018 Laurent Gomila (laurent@sfml-dev.org) // // This software is provided 'as-is', without any express or implied warranty. // In no event will the authors be held liable for any damages arising from the use of this software. @@ -46,19 +46,15 @@ GlResource::~GlResource() //////////////////////////////////////////////////////////// -void GlResource::ensureGlContext() +void GlResource::registerContextDestroyCallback(ContextDestroyCallback callback, void* arg) { - // Empty function for ABI compatibility, use TransientContextLock instead + priv::GlContext::registerContextDestroyCallback(callback, arg); } //////////////////////////////////////////////////////////// -GlResource::TransientContextLock::TransientContextLock() : -m_context(0) +GlResource::TransientContextLock::TransientContextLock() { - // m_context is no longer used - // Remove it when ABI can be broken - priv::GlContext::acquireTransientContext(); } |