diff --git a/src/Magnum/Shaders/DistanceFieldVectorGL.cpp b/src/Magnum/Shaders/DistanceFieldVectorGL.cpp index 1a16dc4fe..1265b4640 100644 --- a/src/Magnum/Shaders/DistanceFieldVectorGL.cpp +++ b/src/Magnum/Shaders/DistanceFieldVectorGL.cpp @@ -166,10 +166,6 @@ template typename DistanceFieldVectorGL::Com }; } -template typename DistanceFieldVectorGL::CompileState DistanceFieldVectorGL::compile() { - return compile(Configuration{}); -} - #ifdef MAGNUM_BUILD_DEPRECATED template typename DistanceFieldVectorGL::CompileState DistanceFieldVectorGL::compile(const Flags flags) { return compile(Configuration{} @@ -253,8 +249,6 @@ template DistanceFieldVectorGL::DistanceFiel template DistanceFieldVectorGL::DistanceFieldVectorGL(const Configuration& configuration): DistanceFieldVectorGL{compile(configuration)} {} -template DistanceFieldVectorGL::DistanceFieldVectorGL(): DistanceFieldVectorGL{Configuration{}} {} - #ifdef MAGNUM_BUILD_DEPRECATED template DistanceFieldVectorGL::DistanceFieldVectorGL(const Flags flags): DistanceFieldVectorGL{compile(Configuration{} .setFlags(flags))} {} diff --git a/src/Magnum/Shaders/DistanceFieldVectorGL.h b/src/Magnum/Shaders/DistanceFieldVectorGL.h index 0ccda624a..f8cc95202 100644 --- a/src/Magnum/Shaders/DistanceFieldVectorGL.h +++ b/src/Magnum/Shaders/DistanceFieldVectorGL.h @@ -237,13 +237,9 @@ template class MAGNUM_SHADERS_EXPORT DistanceFieldVector * @ref shaders-async for more information. * @see @ref DistanceFieldVectorGL(CompileState&&) */ - #ifdef DOXYGEN_GENERATING_OUTPUT + /* Compared to the non-templated shaders like PhongGL or + MeshVisualizerGL2D using a forward declaration is fine here. Huh. */ static CompileState compile(const Configuration& configuration = Configuration{}); - #else - /* Configuration is forward-declared */ - static CompileState compile(const Configuration& configuration); - static CompileState compile(); - #endif #ifdef MAGNUM_BUILD_DEPRECATED /** @@ -270,13 +266,9 @@ template class MAGNUM_SHADERS_EXPORT DistanceFieldVector * @brief Constructor * @m_since_latest */ - #ifdef DOXYGEN_GENERATING_OUTPUT + /* Compared to the non-templated shaders like PhongGL or + MeshVisualizerGL2D using a forward declaration is fine here. Huh. */ explicit DistanceFieldVectorGL(const Configuration& configuration = Configuration{}); - #else - /* Configuration is forward-declared */ - explicit DistanceFieldVectorGL(const Configuration& configuration); - explicit DistanceFieldVectorGL(); - #endif #ifdef MAGNUM_BUILD_DEPRECATED /** diff --git a/src/Magnum/Shaders/FlatGL.cpp b/src/Magnum/Shaders/FlatGL.cpp index 8138d04d9..81ad650d9 100644 --- a/src/Magnum/Shaders/FlatGL.cpp +++ b/src/Magnum/Shaders/FlatGL.cpp @@ -296,10 +296,6 @@ template typename FlatGL::CompileState FlatG }; } -template typename FlatGL::CompileState FlatGL::compile() { - return compile(Configuration{}); -} - #ifdef MAGNUM_BUILD_DEPRECATED template typename FlatGL::CompileState FlatGL::compile(const Flags flags) { return compile(Configuration{} @@ -409,8 +405,6 @@ template FlatGL::FlatGL(CompileState&& state template FlatGL::FlatGL(const Configuration& configuration): FlatGL{compile(configuration)} {} -template FlatGL::FlatGL(): FlatGL{Configuration{}} {} - #ifdef MAGNUM_BUILD_DEPRECATED template FlatGL::FlatGL(const Flags flags): FlatGL{compile(Configuration{} .setFlags(flags))} {} diff --git a/src/Magnum/Shaders/FlatGL.h b/src/Magnum/Shaders/FlatGL.h index 5fd70a0da..af3ec0a63 100644 --- a/src/Magnum/Shaders/FlatGL.h +++ b/src/Magnum/Shaders/FlatGL.h @@ -696,13 +696,9 @@ template class MAGNUM_SHADERS_EXPORT FlatGL: public GL:: * more information. * @see @ref FlatGL(CompileState&&) */ - #ifdef DOXYGEN_GENERATING_OUTPUT + /* Compared to the non-templated shaders like PhongGL or + MeshVisualizerGL2D using a forward declaration is fine here. Huh. */ static CompileState compile(const Configuration& configuration = Configuration{}); - #else - /* Configuration is forward-declared */ - static CompileState compile(const Configuration& configuration); - static CompileState compile(); - #endif #ifdef MAGNUM_BUILD_DEPRECATED /** @@ -729,13 +725,9 @@ template class MAGNUM_SHADERS_EXPORT FlatGL: public GL:: * @brief Constructor * @m_since_latest */ - #ifdef DOXYGEN_GENERATING_OUTPUT + /* Compared to the non-templated shaders like PhongGL or + MeshVisualizerGL2D using a forward declaration is fine here. Huh. */ explicit FlatGL(const Configuration& configuration = Configuration{}); - #else - /* Configuration is forward-declared */ - explicit FlatGL(const Configuration& configuration); - explicit FlatGL(); - #endif #ifdef MAGNUM_BUILD_DEPRECATED /** diff --git a/src/Magnum/Shaders/VectorGL.cpp b/src/Magnum/Shaders/VectorGL.cpp index 4693fcd8b..edd8042b4 100644 --- a/src/Magnum/Shaders/VectorGL.cpp +++ b/src/Magnum/Shaders/VectorGL.cpp @@ -167,10 +167,6 @@ template typename VectorGL::CompileState Vec }; } -template typename VectorGL::CompileState VectorGL::compile() { - return compile(Configuration{}); -} - #ifdef MAGNUM_BUILD_DEPRECATED template typename VectorGL::CompileState VectorGL::compile(const Flags flags) { return compile(Configuration{} @@ -250,8 +246,6 @@ template VectorGL::VectorGL(CompileState&& s template VectorGL::VectorGL(const Configuration& configuration): VectorGL{compile(configuration)} {} -template VectorGL::VectorGL(): VectorGL{Configuration{}} {} - #ifdef MAGNUM_BUILD_DEPRECATED template VectorGL::VectorGL(const Flags flags): VectorGL{compile(Configuration{} .setFlags(flags))} {} diff --git a/src/Magnum/Shaders/VectorGL.h b/src/Magnum/Shaders/VectorGL.h index 341957db7..af4e6f7f7 100644 --- a/src/Magnum/Shaders/VectorGL.h +++ b/src/Magnum/Shaders/VectorGL.h @@ -231,13 +231,9 @@ template class MAGNUM_SHADERS_EXPORT VectorGL: public GL * more information. * @see @ref VectorGL(CompileState&&) */ - #ifdef DOXYGEN_GENERATING_OUTPUT + /* Compared to the non-templated shaders like PhongGL or + MeshVisualizerGL2D using a forward declaration is fine here. Huh. */ static CompileState compile(const Configuration& configuration = Configuration{}); - #else - /* Configuration is forward-declared */ - static CompileState compile(const Configuration& configuration); - static CompileState compile(); - #endif #ifdef MAGNUM_BUILD_DEPRECATED /** @@ -264,13 +260,9 @@ template class MAGNUM_SHADERS_EXPORT VectorGL: public GL * @brief Constructor * @m_since_latest */ - #ifdef DOXYGEN_GENERATING_OUTPUT + /* Compared to the non-templated shaders like PhongGL or + MeshVisualizerGL2D using a forward declaration is fine here. Huh. */ explicit VectorGL(const Configuration& configuration = Configuration{}); - #else - /* Configuration is forward-declared */ - explicit VectorGL(const Configuration& configuration); - explicit VectorGL(); - #endif #ifdef MAGNUM_BUILD_DEPRECATED /** diff --git a/src/Magnum/Shaders/VertexColorGL.cpp b/src/Magnum/Shaders/VertexColorGL.cpp index 07dceec32..5356409bf 100644 --- a/src/Magnum/Shaders/VertexColorGL.cpp +++ b/src/Magnum/Shaders/VertexColorGL.cpp @@ -145,10 +145,6 @@ template typename VertexColorGL::CompileStat }; } -template typename VertexColorGL::CompileState VertexColorGL::compile() { - return compile(Configuration{}); -} - #ifdef MAGNUM_BUILD_DEPRECATED template typename VertexColorGL::CompileState VertexColorGL::compile(const Flags flags) { return compile(Configuration{} @@ -213,8 +209,6 @@ template VertexColorGL::VertexColorGL(Compil template VertexColorGL::VertexColorGL(const Configuration& configuration): VertexColorGL{compile(configuration)} {} -template VertexColorGL::VertexColorGL(): VertexColorGL{Configuration{}} {} - #ifdef MAGNUM_BUILD_DEPRECATED template VertexColorGL::VertexColorGL(const Flags flags): VertexColorGL{compile(Configuration{} .setFlags(flags))} {} diff --git a/src/Magnum/Shaders/VertexColorGL.h b/src/Magnum/Shaders/VertexColorGL.h index c0a81e577..3dbac4a3e 100644 --- a/src/Magnum/Shaders/VertexColorGL.h +++ b/src/Magnum/Shaders/VertexColorGL.h @@ -224,13 +224,9 @@ template class MAGNUM_SHADERS_EXPORT VertexColorGL: publ * more information. * @see @ref VertexColorGL(CompileState&&) */ - #ifdef DOXYGEN_GENERATING_OUTPUT + /* Compared to the non-templated shaders like PhongGL or + MeshVisualizerGL2D using a forward declaration is fine here. Huh. */ static CompileState compile(const Configuration& configuration = Configuration{}); - #else - /* Configuration is forward-declared */ - static CompileState compile(const Configuration& configuration); - static CompileState compile(); - #endif #ifdef MAGNUM_BUILD_DEPRECATED /** @@ -257,13 +253,9 @@ template class MAGNUM_SHADERS_EXPORT VertexColorGL: publ * @brief Constructor * @m_since_latest */ - #ifdef DOXYGEN_GENERATING_OUTPUT + /* Compared to the non-templated shaders like PhongGL or + MeshVisualizerGL2D using a forward declaration is fine here. Huh. */ explicit VertexColorGL(const Configuration& configuration = Configuration{}); - #else - /* Configuration is forward-declared */ - explicit VertexColorGL(const Configuration& configuration); - explicit VertexColorGL(); - #endif #ifdef MAGNUM_BUILD_DEPRECATED /**