diff options
Diffstat (limited to 'src/SFML/Graphics/GLExtensions.cpp')
| -rw-r--r-- | src/SFML/Graphics/GLExtensions.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/SFML/Graphics/GLExtensions.cpp b/src/SFML/Graphics/GLExtensions.cpp index 0c257e8..21f718b 100644 --- a/src/SFML/Graphics/GLExtensions.cpp +++ b/src/SFML/Graphics/GLExtensions.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////// // // SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org) +// Copyright (C) 2007-2016 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. @@ -26,6 +26,7 @@ // Headers //////////////////////////////////////////////////////////// #include <SFML/Graphics/GLExtensions.hpp> +#include <SFML/Window/Context.hpp> #include <SFML/System/Err.hpp> @@ -40,9 +41,16 @@ void ensureExtensionsInit() static bool initialized = false; if (!initialized) { + const Context* context = Context::getActiveContext(); + + if (!context) + return; + sfogl_LoadFunctions(); - if (!sfogl_IsVersionGEQ(1, 1)) + ContextSettings settings = context->getSettings(); + + if ((settings.majorVersion < 1) || ((settings.majorVersion == 1) && (settings.minorVersion < 1))) { err() << "sfml-graphics requires support for OpenGL 1.1 or greater" << std::endl; err() << "Ensure that hardware acceleration is enabled if available" << std::endl; |