From 303d07976c5e2b32f0c1d5dc22278c6f92ea6f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Mon, 24 Oct 2016 14:09:14 +0200 Subject: [PATCH] Added back GlResource::ensureGlContext() for ABI compatibility. --- include/SFML/Window/GlResource.hpp | 6 ++++++ src/SFML/Window/GlResource.cpp | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/include/SFML/Window/GlResource.hpp b/include/SFML/Window/GlResource.hpp index 876f177cd..627ec30a3 100644 --- a/include/SFML/Window/GlResource.hpp +++ b/include/SFML/Window/GlResource.hpp @@ -57,6 +57,12 @@ protected: //////////////////////////////////////////////////////////// ~GlResource(); + //////////////////////////////////////////////////////////// + /// \brief Empty function for ABI compatibility, use acquireTransientContext instead + /// + //////////////////////////////////////////////////////////// + static void ensureGlContext(); + //////////////////////////////////////////////////////////// /// \brief RAII helper class to temporarily lock an available context for use /// diff --git a/src/SFML/Window/GlResource.cpp b/src/SFML/Window/GlResource.cpp index a3cdddf6d..e9a9ecc9e 100644 --- a/src/SFML/Window/GlResource.cpp +++ b/src/SFML/Window/GlResource.cpp @@ -72,6 +72,13 @@ GlResource::~GlResource() } +//////////////////////////////////////////////////////////// +void GlResource::ensureGlContext() +{ + // Empty function for ABI compatibility, use acquireTransientContext instead +} + + //////////////////////////////////////////////////////////// GlResource::TransientContextLock::TransientContextLock() : m_context(0)