diff --git a/doc/changelog.dox b/doc/changelog.dox index a0b0cac54..e6ff4b5bb 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -157,6 +157,14 @@ See also: statelessness when doing batch processing. Use the @ref TextureTools::DistanceField class instead. +@subsection changelog-latest-compatibility Potential compatibility breakages, removed APIs + +- Removed the `Magnum/Test/AbstractOpenGLTester.h` header that was deprecated + in January 2017. Use @ref Magnum/GL/OpenGLTester.h and the + @ref GL::OpenGLTester library instead. Note that the deprecated + `Magnum/OpenGLTester.h` header is still present, along with all other + deprecated GL-specific headers and APIs in the project root. + @section changelog-2018-10 2018.10 Released 2018-10-23, tagged as diff --git a/src/Magnum/GL/CMakeLists.txt b/src/Magnum/GL/CMakeLists.txt index aa1c32b71..253539975 100644 --- a/src/Magnum/GL/CMakeLists.txt +++ b/src/Magnum/GL/CMakeLists.txt @@ -244,14 +244,10 @@ if(WITH_OPENGLTESTER) set(MagnumOpenGLTester_SRCS OpenGLTester.cpp) set(MagnumOpenGLTester_HEADERS OpenGLTester.h) - if(BUILD_DEPRECATED) - set(MagnumOpenGLTester_DEPRECATED_HEADERS ../Test/AbstractOpenGLTester.h) - endif() add_library(MagnumOpenGLTester STATIC ${MagnumOpenGLTester_SRCS} - ${MagnumOpenGLTester_HEADERS} - ${MagnumOpenGLTester_DEPRECATED_HEADERS}) # TODO: remove when the header is removed + ${MagnumOpenGLTester_HEADERS}) set_target_properties(MagnumOpenGLTester PROPERTIES DEBUG_POSTFIX "-d" FOLDER "Magnum/GL") diff --git a/src/Magnum/Test/AbstractOpenGLTester.h b/src/Magnum/Test/AbstractOpenGLTester.h deleted file mode 100644 index dc573b5a8..000000000 --- a/src/Magnum/Test/AbstractOpenGLTester.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef Magnum_Test_AbstractOpenGLTester_h -#define Magnum_Test_AbstractOpenGLTester_h -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#include "Magnum/OpenGLTester.h" -#ifdef MAGNUM_BUILD_DEPRECATED -CORRADE_DEPRECATED_FILE("use Magnum/OpenGLTester.h and Magnum::OpenGLTester library instead") - -#include "Magnum/Context.h" -#include "Magnum/Extensions.h" -#include "Magnum/DebugOutput.h" - -namespace Magnum { namespace Test { - -class AbstractOpenGLTester: public TestSuite::Tester { - public: - /* Deprecating the class doesn't make GCC print the warnings :( */ - explicit CORRADE_DEPRECATED("use OpenGLTester instead") AbstractOpenGLTester(); - - private: - struct WindowlessApplication: Platform::WindowlessApplication { - explicit WindowlessApplication(const Arguments& arguments): Platform::WindowlessApplication{arguments, NoCreate} {} - int exec() override final { return 0; } - - using Platform::WindowlessApplication::tryCreateContext; - using Platform::WindowlessApplication::createContext; - - } _windowlessApplication; -}; - -AbstractOpenGLTester::AbstractOpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{{arguments().first, arguments().second}} { - /* Try to create debug context, fallback to normal one if not possible. No - such thing on macOS or iOS. */ - #ifndef CORRADE_TARGET_APPLE - if(!_windowlessApplication.tryCreateContext(Platform::WindowlessApplication::Configuration{}.setFlags(Platform::WindowlessApplication::Configuration::Flag::Debug))) - _windowlessApplication.createContext(); - #else - _windowlessApplication.createContext(); - #endif - - if(Context::current().isExtensionSupported()) { - Renderer::enable(Renderer::Feature::DebugOutput); - Renderer::enable(Renderer::Feature::DebugOutputSynchronous); - DebugOutput::setDefaultCallback(); - - /* Disable "Buffer detailed info" message on NV (too spammy) */ - DebugOutput::setEnabled(DebugOutput::Source::Api, DebugOutput::Type::Other, {131185}, false); - } -} - -#define MAGNUM_GL_TEST_MAIN(Class) CORRADE_TEST_MAIN(Class) -#else -#error use Magnum/OpenGLTester.h and Magnum::OpenGLTester library instead -#endif - -}} - -#endif