diff --git a/src/Magnum/Animation/Interpolation.cpp b/src/Magnum/Animation/Interpolation.cpp index e0715b5ca..ac75e1215 100644 --- a/src/Magnum/Animation/Interpolation.cpp +++ b/src/Magnum/Animation/Interpolation.cpp @@ -31,7 +31,6 @@ namespace Magnum { namespace Animation { -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const Interpolation value) { const bool packed = debug.immediateFlags() >= Debug::Flag::Packed; @@ -70,7 +69,6 @@ Debug& operator<<(Debug& debug, const Extrapolation value) { return debug << (packed ? "" : "(") << Debug::nospace << Debug::hex << UnsignedByte(value) << Debug::nospace << (packed ? "" : ")"); } -#endif namespace Implementation { diff --git a/src/Magnum/Animation/Player.cpp b/src/Magnum/Animation/Player.cpp index d13ccf90a..d5e145421 100644 --- a/src/Magnum/Animation/Player.cpp +++ b/src/Magnum/Animation/Player.cpp @@ -53,9 +53,7 @@ Debug& operator<<(Debug& debug, const State value) { #define MAGNUM_EXPORT_HPP #endif -#ifndef DOXYGEN_GENERATING_OUTPUT template class MAGNUM_EXPORT_HPP Player; template class MAGNUM_EXPORT_HPP Player; -#endif }} diff --git a/src/Magnum/Audio/Listener.cpp b/src/Magnum/Audio/Listener.cpp index f3f21f4c0..b3345024e 100644 --- a/src/Magnum/Audio/Listener.cpp +++ b/src/Magnum/Audio/Listener.cpp @@ -119,9 +119,7 @@ template bool Listener::isActive() const { #define MAGNUM_AUDIO_EXPORT_HPP #endif -#ifndef DOXYGEN_GENERATING_OUTPUT template class MAGNUM_AUDIO_EXPORT_HPP Listener<2>; template class MAGNUM_AUDIO_EXPORT_HPP Listener<3>; -#endif }} diff --git a/src/Magnum/Audio/Playable.cpp b/src/Magnum/Audio/Playable.cpp index 1650cfc62..4d02f07d5 100644 --- a/src/Magnum/Audio/Playable.cpp +++ b/src/Magnum/Audio/Playable.cpp @@ -77,9 +77,7 @@ template void Playable::cleanGain() { #define MAGNUM_AUDIO_EXPORT_HPP #endif -#ifndef DOXYGEN_GENERATING_OUTPUT template class MAGNUM_AUDIO_EXPORT_HPP Playable<2>; template class MAGNUM_AUDIO_EXPORT_HPP Playable<3>; -#endif }} diff --git a/src/Magnum/Audio/PlayableGroup.cpp b/src/Magnum/Audio/PlayableGroup.cpp index 6e8d717e4..2f5006791 100644 --- a/src/Magnum/Audio/PlayableGroup.cpp +++ b/src/Magnum/Audio/PlayableGroup.cpp @@ -93,9 +93,7 @@ template PlayableGroup& PlayableGroup; template class MAGNUM_AUDIO_EXPORT_HPP PlayableGroup<3>; -#endif }} diff --git a/src/Magnum/DebugTools/ObjectRenderer.cpp b/src/Magnum/DebugTools/ObjectRenderer.cpp index dc120285d..f9ca84bfb 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.cpp +++ b/src/Magnum/DebugTools/ObjectRenderer.cpp @@ -54,8 +54,7 @@ template<> struct Renderer<3> { } -/* Doxygen gets confused when using {} to initialize parent object */ -template ObjectRenderer::ObjectRenderer(ResourceManager& manager, SceneGraph::AbstractObject& object, ResourceKey options, SceneGraph::DrawableGroup* drawables): SceneGraph::Drawable(object, drawables), _options{manager.get(options)} { +template ObjectRenderer::ObjectRenderer(ResourceManager& manager, SceneGraph::AbstractObject& object, ResourceKey options, SceneGraph::DrawableGroup* drawables): SceneGraph::Drawable{object, drawables}, _options{manager.get(options)} { /* Shader */ _shader = manager.get>(Renderer::shader()); if(!_shader) manager.set(_shader.key(), new Shaders::VertexColorGL); diff --git a/src/Magnum/GL/AbstractQuery.cpp b/src/Magnum/GL/AbstractQuery.cpp index bcdbedce9..d487b73b2 100644 --- a/src/Magnum/GL/AbstractQuery.cpp +++ b/src/Magnum/GL/AbstractQuery.cpp @@ -123,7 +123,6 @@ bool AbstractQuery::resultAvailable() { return result == GL_TRUE; } -#ifndef DOXYGEN_GENERATING_OUTPUT template<> UnsignedInt AbstractQuery::result() { UnsignedInt result; #ifndef MAGNUM_TARGET_GLES2 @@ -165,7 +164,6 @@ template<> Long AbstractQuery::result() { #endif return result; } -#endif void AbstractQuery::begin() { #ifndef MAGNUM_TARGET_GLES2 diff --git a/src/Magnum/GL/AbstractTexture.cpp b/src/Magnum/GL/AbstractTexture.cpp index 352c4cbdc..2c810a3a4 100644 --- a/src/Magnum/GL/AbstractTexture.cpp +++ b/src/Magnum/GL/AbstractTexture.cpp @@ -171,8 +171,7 @@ void AbstractTexture::bindImplementationFallback(const GLint firstTextureUnit, c } #ifndef MAGNUM_TARGET_GLES -/** @todoc const Containers::ArrayView makes Doxygen grumpy */ -void AbstractTexture::bindImplementationMulti(const GLint firstTextureUnit, Containers::ArrayView textures) { +void AbstractTexture::bindImplementationMulti(const GLint firstTextureUnit, const Containers::ArrayView textures) { Implementation::TextureState& textureState = Context::current().state().texture; /* Create array of IDs and also update bindings in state tracker */ @@ -1593,8 +1592,7 @@ void AbstractTexture::subImage2DImplementationDefault(AbstractTexture& self, GLi glTexSubImage2D(self._target, level, offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), data); } -/* Doxygen gets confused by the template parameter */ -#if !defined(DOXYGEN_GENERATING_OUTPUT) && !defined(MAGNUM_TARGET_GLES) +#ifndef MAGNUM_TARGET_GLES template void AbstractTexture::subImageImplementationSvga3DSliceBySlice(AbstractTexture& self, GLint level, const Vector2i& offset, const Vector2i& size, PixelFormat format, PixelType type, const GLvoid* const data, const PixelStorage& storage) { /* Upload the data slice by slice only if this is an array texture and we are copying from user memory (not from a buffer) */ @@ -1671,8 +1669,7 @@ void AbstractTexture::subImage3DImplementationDefault(AbstractTexture& self, GLi #endif } -/* Doxygen gets confused by the template parameter */ -#if !defined(DOXYGEN_GENERATING_OUTPUT) && !defined(MAGNUM_TARGET_WEBGL) +#ifndef MAGNUM_TARGET_WEBGL template void AbstractTexture::subImageImplementationSvga3DSliceBySlice(AbstractTexture& self, GLint level, const Vector3i& offset, const Vector3i& size, PixelFormat format, PixelType type, const GLvoid* const data, const PixelStorage& storage) { /* Upload the data slice by slice only if this is an array texture and we are copying from user memory (not from a buffer) */ @@ -1736,7 +1733,6 @@ void AbstractTexture::invalidateSubImageImplementationARB(AbstractTexture& self, } #endif -#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_TARGET_GLES template void AbstractTexture::image(const GLint level, Image& image, const ImageFlags flags) { const Math::Vector size = DataHelper::imageSize(*this, level); @@ -2076,9 +2072,7 @@ template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<1>(GLint, con template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<2>(GLint, const Range2Di&, CompressedBufferImage<2>&, BufferUsage); template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<3>(GLint, const Range3Di&, CompressedBufferImage<3>&, BufferUsage); #endif -#endif -#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_TARGET_GLES Math::Vector<1, GLint> AbstractTexture::DataHelper<1>::compressedBlockSize(const GLenum target, const TextureFormat format) { GLint value; @@ -2398,6 +2392,5 @@ void AbstractTexture::DataHelper<3>::setWrapping(AbstractTexture& texture, const #endif } #endif -#endif }} diff --git a/src/Magnum/GL/Buffer.cpp b/src/Magnum/GL/Buffer.cpp index 149539d90..8de6dfca1 100644 --- a/src/Magnum/GL/Buffer.cpp +++ b/src/Magnum/GL/Buffer.cpp @@ -687,7 +687,6 @@ bool Buffer::unmapImplementationApple(Buffer& self) { } #endif -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const Buffer::TargetHint value) { debug << "GL::Buffer::TargetHint" << Debug::nospace; @@ -745,6 +744,5 @@ Debug& operator<<(Debug& debug, const Buffer::Target value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } #endif -#endif }} diff --git a/src/Magnum/GL/BufferImage.cpp b/src/Magnum/GL/BufferImage.cpp index efd6d84c9..8163a6f02 100644 --- a/src/Magnum/GL/BufferImage.cpp +++ b/src/Magnum/GL/BufferImage.cpp @@ -155,7 +155,6 @@ template Buffer CompressedBufferImage::relea return Utility::move(_buffer); } -#ifndef DOXYGEN_GENERATING_OUTPUT template class MAGNUM_GL_EXPORT BufferImage<1>; template class MAGNUM_GL_EXPORT BufferImage<2>; template class MAGNUM_GL_EXPORT BufferImage<3>; @@ -164,6 +163,5 @@ template class MAGNUM_GL_EXPORT CompressedBufferImage<1>; template class MAGNUM_GL_EXPORT CompressedBufferImage<2>; template class MAGNUM_GL_EXPORT CompressedBufferImage<3>; #endif -#endif }} diff --git a/src/Magnum/GL/Context.cpp b/src/Magnum/GL/Context.cpp index 03e8c9127..559b25d64 100644 --- a/src/Magnum/GL/Context.cpp +++ b/src/Magnum/GL/Context.cpp @@ -1323,7 +1323,6 @@ Context::Configuration& Context::Configuration::addDisabledExtensions(std::initi return addDisabledExtensions(Containers::arrayView(extensions)); } -#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_TARGET_WEBGL Debug& operator<<(Debug& debug, const Context::Flag value) { const bool packed = debug.immediateFlags() >= Debug::Flag::Packed; @@ -1417,6 +1416,5 @@ Debug& operator<<(Debug& debug, const Context::DetectedDrivers value) { #endif }); } -#endif }} diff --git a/src/Magnum/GL/DebugOutput.cpp b/src/Magnum/GL/DebugOutput.cpp index 54f7c16c7..e7503de7c 100644 --- a/src/Magnum/GL/DebugOutput.cpp +++ b/src/Magnum/GL/DebugOutput.cpp @@ -220,7 +220,6 @@ void DebugOutput::callbackImplementationKhrES(const Callback callback) { } #endif -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const DebugOutput::Source value) { debug << "GL::DebugOutput::Source" << Debug::nospace; @@ -276,7 +275,6 @@ Debug& operator<<(Debug& debug, const DebugOutput::Severity value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } -#endif void DebugMessage::insert(const Source source, const Type type, const UnsignedInt id, const DebugOutput::Severity severity, const Containers::StringView string) { Context::current().state().debug.messageInsertImplementation(GLenum(source), GLenum(type), id, GLenum(severity), string.size(), string.data()); @@ -294,7 +292,6 @@ void DebugMessage::insertImplementationGremedy(GLenum, GLenum, GLuint, GLenum, c } #endif -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const DebugMessage::Source value) { debug << "GL::DebugMessage::Source" << Debug::nospace; @@ -327,7 +324,6 @@ Debug& operator<<(Debug& debug, const DebugMessage::Type value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } -#endif Int DebugGroup::maxStackDepth() { if(!Context::current().isExtensionSupported()) @@ -370,7 +366,6 @@ void DebugGroup::pushImplementationExt(GLenum, GLuint, const GLsizei length, con void DebugGroup::popImplementationNoOp() {} -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const DebugGroup::Source value) { debug << "GL::DebugGroup::Source" << Debug::nospace; @@ -385,7 +380,6 @@ Debug& operator<<(Debug& debug, const DebugGroup::Source value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } -#endif }} #endif diff --git a/src/Magnum/GL/DefaultFramebuffer.cpp b/src/Magnum/GL/DefaultFramebuffer.cpp index 24b0f7ca0..abf973e0d 100644 --- a/src/Magnum/GL/DefaultFramebuffer.cpp +++ b/src/Magnum/GL/DefaultFramebuffer.cpp @@ -126,7 +126,6 @@ void DefaultFramebuffer::invalidate(std::initializer_list MultisampleTexture& MultisampleText return *this; } -#ifndef DOXYGEN_GENERATING_OUTPUT template class /* GCC needs the export macro on the class definition (and here it warns that the type is already defined so the export is ignored), while Clang @@ -119,7 +118,6 @@ template class MAGNUM_GL_EXPORT #endif MultisampleTexture<3>; -#endif }} #endif diff --git a/src/Magnum/GL/PixelFormat.cpp b/src/Magnum/GL/PixelFormat.cpp index e7a2e6f16..92fe453bd 100644 --- a/src/Magnum/GL/PixelFormat.cpp +++ b/src/Magnum/GL/PixelFormat.cpp @@ -38,7 +38,6 @@ namespace Magnum { namespace GL { namespace { -#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */ constexpr struct { PixelFormat format; PixelType type; @@ -71,7 +70,6 @@ constexpr TextureFormat TextureFormatMapping[] { #undef _d #undef _c }; -#endif } @@ -344,7 +342,6 @@ Containers::Optional genericPixelFormat(const TextureFormat } } -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const PixelFormat value) { debug << "GL::PixelFormat" << Debug::nospace; @@ -480,7 +477,6 @@ Debug& operator<<(Debug& debug, const PixelType value) { namespace { -#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */ /* Enum values are the same between CompressedPixelFormat and TextureFormat, so having just a single table for both */ constexpr CompressedPixelFormat CompressedFormatMapping[] { @@ -492,7 +488,6 @@ constexpr CompressedPixelFormat CompressedFormatMapping[] { #undef _d #undef _c }; -#endif } @@ -693,6 +688,5 @@ Debug& operator<<(Debug& debug, const CompressedPixelFormat value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } -#endif }} diff --git a/src/Magnum/GL/Renderer.cpp b/src/Magnum/GL/Renderer.cpp index b8ba8377a..b96f8910f 100644 --- a/src/Magnum/GL/Renderer.cpp +++ b/src/Magnum/GL/Renderer.cpp @@ -466,7 +466,6 @@ void Renderer::initializeContextBasedFunctionality() { setClearColor(0x1f1f1f_rgbf); } -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const Renderer::Error value) { debug << "GL::Renderer::Error" << Debug::nospace; @@ -523,6 +522,5 @@ Debug& operator<<(Debug& debug, const Renderer::GraphicsResetStatus value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } #endif -#endif }} diff --git a/src/Magnum/GL/Sampler.cpp b/src/Magnum/GL/Sampler.cpp index c949207aa..0d103da0e 100644 --- a/src/Magnum/GL/Sampler.cpp +++ b/src/Magnum/GL/Sampler.cpp @@ -130,7 +130,6 @@ Float Sampler::maxMaxAnisotropy() { return value; } -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const SamplerFilter value) { debug << "GL::SamplerFilter" << Debug::nospace; @@ -236,6 +235,5 @@ Debug& operator<<(Debug& debug, const SamplerDepthStencilMode value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } #endif -#endif }} diff --git a/src/Magnum/GL/Shader.cpp b/src/Magnum/GL/Shader.cpp index 1413450c2..c173e0893 100644 --- a/src/Magnum/GL/Shader.cpp +++ b/src/Magnum/GL/Shader.cpp @@ -965,7 +965,6 @@ void Shader::completionStatusImplementationFallback(GLuint, GLenum, GLint* value *value = GL_TRUE; } -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const Shader::Type value) { debug << "GL::Shader::Type" << Debug::nospace; @@ -986,6 +985,5 @@ Debug& operator<<(Debug& debug, const Shader::Type value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } -#endif }} diff --git a/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp index 7b4af2901..54285d1b9 100644 --- a/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp @@ -891,7 +891,6 @@ struct MyShader: AbstractShaderProgram { additionsUniform; }; -#ifndef DOXYGEN_GENERATING_OUTPUT MyShader::MyShader() { Utility::Resource rs("AbstractShaderProgramGLTest"); @@ -932,7 +931,6 @@ MyShader::MyShader() { colorUniform = uniformLocation("color"); additionsUniform = uniformLocation("additions"); } -#endif void AbstractShaderProgramGLTest::uniform() { MyShader shader; @@ -995,7 +993,6 @@ struct MyDoubleShader: AbstractShaderProgram { additionsUniform; }; -#ifndef DOXYGEN_GENERATING_OUTPUT MyDoubleShader::MyDoubleShader() { Utility::Resource rs("AbstractShaderProgramGLTest"); @@ -1016,7 +1013,6 @@ MyDoubleShader::MyDoubleShader() { colorUniform = uniformLocation("color"); additionsUniform = uniformLocation("additions"); } -#endif void AbstractShaderProgramGLTest::uniformDouble() { if(!Context::current().isExtensionSupported()) @@ -1187,7 +1183,6 @@ struct UniformBlockShader: AbstractShaderProgram { materialUniformBlock; }; -#ifndef DOXYGEN_GENERATING_OUTPUT UniformBlockShader::UniformBlockShader() { Utility::Resource rs("AbstractShaderProgramGLTest"); @@ -1217,7 +1212,6 @@ UniformBlockShader::UniformBlockShader() { matricesUniformBlock = uniformBlockIndex("matrices"); materialUniformBlock = uniformBlockIndex("material"); } -#endif void AbstractShaderProgramGLTest::uniformBlock() { #ifndef MAGNUM_TARGET_GLES diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index 2226ed4f8..527d58b6c 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -997,7 +997,6 @@ struct Checker { Framebuffer framebuffer; }; -#ifndef DOXYGEN_GENERATING_OUTPUT FloatShader::FloatShader(Containers::StringView type, Containers::StringView conversion /* WebGL 1 requires that at least one attribute is not instanced. The addVertexBufferInstancedFloat() and drawInstancedAttributeSingleInstance() @@ -1196,7 +1195,6 @@ Checker::Checker(AbstractShaderProgram&& shader, RenderbufferFormat format, Mesh template T Checker::get(PixelFormat format, PixelType type) { return Containers::arrayCast(framebuffer.read({{}, Vector2i{1}}, {format, type}).data())[0]; } -#endif #ifndef MAGNUM_TARGET_GLES2 void MeshGLTest::addVertexBufferUnsignedInt() { @@ -2108,7 +2106,6 @@ struct MultipleShader: AbstractShaderProgram { explicit MultipleShader(); }; -#ifndef DOXYGEN_GENERATING_OUTPUT MultipleShader::MultipleShader() { #ifndef MAGNUM_TARGET_GLES Shader vert( @@ -2171,7 +2168,6 @@ MultipleShader::MultipleShader() { CORRADE_INTERNAL_ASSERT_OUTPUT(link()); } -#endif void MeshGLTest::addVertexBufferMultiple() { const Float data[] = { @@ -3928,7 +3924,6 @@ struct MultiDrawChecker { Framebuffer _framebuffer; }; -#ifndef DOXYGEN_GENERATING_OUTPUT MultiDrawChecker::MultiDrawChecker(): _framebuffer{{{}, Vector2i{2}}} { _renderbuffer.setStorage( #ifndef MAGNUM_TARGET_GLES2 @@ -3952,7 +3947,6 @@ Vector4 MultiDrawChecker::get() { redChannel[1][0], redChannel[1][1]}); } -#endif void MeshGLTest::multiDraw() { auto&& data = MultiDrawData[testCaseInstanceId()]; diff --git a/src/Magnum/GL/Test/SampleQueryGLTest.cpp b/src/Magnum/GL/Test/SampleQueryGLTest.cpp index 103a0b52e..958c9d31a 100644 --- a/src/Magnum/GL/Test/SampleQueryGLTest.cpp +++ b/src/Magnum/GL/Test/SampleQueryGLTest.cpp @@ -165,7 +165,6 @@ struct MyShader: public AbstractShaderProgram { explicit MyShader(); }; -#ifndef DOXYGEN_GENERATING_OUTPUT MyShader::MyShader() { #ifndef MAGNUM_TARGET_GLES Shader vert( @@ -214,7 +213,6 @@ MyShader::MyShader() { CORRADE_INTERNAL_ASSERT_OUTPUT(link()); } -#endif void SampleQueryGLTest::querySamplesPassed() { #ifdef MAGNUM_TARGET_GLES2 diff --git a/src/Magnum/GL/Texture.cpp b/src/Magnum/GL/Texture.cpp index e6f296b0c..7b3003ee5 100644 --- a/src/Magnum/GL/Texture.cpp +++ b/src/Magnum/GL/Texture.cpp @@ -182,7 +182,6 @@ template Texture& Texture::setLa } #endif -#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_TARGET_GLES template class /* GCC needs the export macro on the class definition (and here it warns @@ -205,6 +204,5 @@ template class #endif Texture<3>; #endif -#endif }} diff --git a/src/Magnum/GL/TextureArray.cpp b/src/Magnum/GL/TextureArray.cpp index 95c516c86..c203837dc 100644 --- a/src/Magnum/GL/TextureArray.cpp +++ b/src/Magnum/GL/TextureArray.cpp @@ -161,7 +161,6 @@ template TextureArray& TextureArray; -#endif }} #endif diff --git a/src/Magnum/GL/TextureFormat.cpp b/src/Magnum/GL/TextureFormat.cpp index ae52690b7..d4f4138da 100644 --- a/src/Magnum/GL/TextureFormat.cpp +++ b/src/Magnum/GL/TextureFormat.cpp @@ -41,7 +41,6 @@ namespace Magnum { namespace GL { genericCompressedPixelFormat(CompressedPixelFormat) so are defined in PixelFormat.cpp instead (and tested there too) */ -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const TextureFormat value) { debug << "GL::TextureFormat" << Debug::nospace; @@ -302,6 +301,5 @@ Debug& operator<<(Debug& debug, const TextureFormat value) { return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")"; } -#endif }} diff --git a/src/Magnum/GL/Version.cpp b/src/Magnum/GL/Version.cpp index ebab2eee8..da229bfdb 100644 --- a/src/Magnum/GL/Version.cpp +++ b/src/Magnum/GL/Version.cpp @@ -40,7 +40,6 @@ Containers::Pair version(const Version version) { return {v/100, (v%100)/10}; } -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const Version value) { switch(value) { /* LCOV_EXCL_START */ @@ -75,6 +74,5 @@ Debug& operator<<(Debug& debug, const Version value) { return debug << "Invalid(" << Debug::nospace << Debug::hex << Int(value) << Debug::nospace << ")"; } -#endif }} diff --git a/src/Magnum/Image.cpp b/src/Magnum/Image.cpp index ebd02211c..16a7c9f68 100644 --- a/src/Magnum/Image.cpp +++ b/src/Magnum/Image.cpp @@ -134,7 +134,6 @@ template Containers::Array CompressedImage; template class MAGNUM_EXPORT Image<2>; template class MAGNUM_EXPORT Image<3>; @@ -142,6 +141,5 @@ template class MAGNUM_EXPORT Image<3>; template class MAGNUM_EXPORT CompressedImage<1>; template class MAGNUM_EXPORT CompressedImage<2>; template class MAGNUM_EXPORT CompressedImage<3>; -#endif } diff --git a/src/Magnum/ImageView.cpp b/src/Magnum/ImageView.cpp index ae5a09ad0..0735d80cd 100644 --- a/src/Magnum/ImageView.cpp +++ b/src/Magnum/ImageView.cpp @@ -86,7 +86,6 @@ template std::pair(*this); } -#ifndef DOXYGEN_GENERATING_OUTPUT template class MAGNUM_EXPORT ImageView<1, const char>; template class MAGNUM_EXPORT ImageView<2, const char>; template class MAGNUM_EXPORT ImageView<3, const char>; @@ -100,6 +99,5 @@ template class MAGNUM_EXPORT CompressedImageView<3, const char>; template class MAGNUM_EXPORT CompressedImageView<1, char>; template class MAGNUM_EXPORT CompressedImageView<2, char>; template class MAGNUM_EXPORT CompressedImageView<3, char>; -#endif } diff --git a/src/Magnum/Math/instantiation.cpp b/src/Magnum/Math/instantiation.cpp index 31cfe6143..b21ffbf46 100644 --- a/src/Magnum/Math/instantiation.cpp +++ b/src/Magnum/Math/instantiation.cpp @@ -34,7 +34,6 @@ namespace Corrade { namespace Utility { -#ifndef DOXYGEN_GENERATING_OUTPUT /* Apparently clang-cl doesn't propagate the export from the extern template declaration or something */ #ifdef CORRADE_TARGET_CLANG_CL @@ -96,13 +95,11 @@ template struct MAGNUM_EXPORT_TEMPLATE ConfigurationValue>; template struct MAGNUM_EXPORT_TEMPLATE ConfigurationValue>; -#endif }} namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT template Debug& operator<<(Debug&, const Bezier<2, 2, Float>&); template Debug& operator<<(Debug&, const Bezier<2, 3, Float>&); template Debug& operator<<(Debug&, const Bezier<3, 2, Float>&); @@ -221,6 +218,5 @@ template Debug& operator<<(Debug&, const Range<3, Int>&); template Debug& operator<<(Debug&, const Range<1, Double>&); template Debug& operator<<(Debug&, const Range<2, Double>&); template Debug& operator<<(Debug&, const Range<3, Double>&); -#endif }} diff --git a/src/Magnum/Mesh.cpp b/src/Magnum/Mesh.cpp index 800e6de22..2cc8f1888 100644 --- a/src/Magnum/Mesh.cpp +++ b/src/Magnum/Mesh.cpp @@ -33,7 +33,6 @@ namespace Magnum { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace { constexpr const char* MeshPrimitiveNames[] { @@ -87,7 +86,6 @@ Debug& operator<<(Debug& debug, const MeshIndexType value) { return debug << (packed ? "" : "(") << Debug::nospace << Debug::hex << UnsignedInt(value) << Debug::nospace << (packed ? "" : ")"); } -#endif UnsignedInt meshIndexTypeSize(const MeshIndexType type) { CORRADE_ASSERT(!isMeshIndexTypeImplementationSpecific(type), diff --git a/src/Magnum/PixelFormat.cpp b/src/Magnum/PixelFormat.cpp index 8caf1d6ba..d9b1ae5db 100644 --- a/src/Magnum/PixelFormat.cpp +++ b/src/Magnum/PixelFormat.cpp @@ -730,17 +730,14 @@ PixelFormat pixelFormat(const PixelFormat format, const UnsignedInt channelCount namespace { -#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */ constexpr const char* PixelFormatNames[] { #define _c(format) #format, #include "Magnum/Implementation/pixelFormatMapping.hpp" #undef _c }; -#endif } -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const PixelFormat value) { const bool packed = debug.immediateFlags() >= Debug::Flag::Packed; @@ -757,11 +754,9 @@ Debug& operator<<(Debug& debug, const PixelFormat value) { return debug << (packed ? "" : "(") << Debug::nospace << Debug::hex << UnsignedInt(value) << Debug::nospace << (packed ? "" : ")"); } -#endif namespace { -#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */ constexpr UnsignedShort CompressedBlockData[] { /* Assuming w/h/d/s is never larger than 16 (and never zero), each number has 1 subtracted and packed into four bits, 16 bits in total. The size @@ -776,7 +771,6 @@ constexpr UnsignedShort CompressedBlockData[] { #include "Magnum/Implementation/compressedPixelFormatMapping.hpp" #undef _c }; -#endif } @@ -1192,17 +1186,14 @@ bool isCompressedPixelFormatSrgb(const CompressedPixelFormat format) { namespace { -#ifndef DOXYGEN_GENERATING_OUTPUT constexpr const char* CompressedPixelFormatNames[] { #define _c(format, width, height, depth, size) #format, #include "Magnum/Implementation/compressedPixelFormatMapping.hpp" #undef _c }; -#endif } -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const CompressedPixelFormat value) { const bool packed = debug.immediateFlags() >= Debug::Flag::Packed; @@ -1219,7 +1210,6 @@ Debug& operator<<(Debug& debug, const CompressedPixelFormat value) { return debug << (packed ? "" : "(") << Debug::nospace << Debug::hex << UnsignedInt(value) << Debug::nospace << (packed ? "" : ")"); } -#endif } diff --git a/src/Magnum/Platform/WindowlessWglApplication.cpp b/src/Magnum/Platform/WindowlessWglApplication.cpp index b86530005..b840939e0 100644 --- a/src/Magnum/Platform/WindowlessWglApplication.cpp +++ b/src/Magnum/Platform/WindowlessWglApplication.cpp @@ -32,7 +32,6 @@ #include "Magnum/GL/Version.h" -#ifndef DOXYGEN_GENERATING_OUTPUT /* Define stuff that we need because I can't be bothered with creating a new header just for a few defines */ #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 @@ -45,7 +44,6 @@ #ifndef WGL_ARB_create_context_no_error #define WGL_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3 #endif -#endif namespace Magnum { namespace Platform { diff --git a/src/Magnum/Resource.cpp b/src/Magnum/Resource.cpp index 5442944c2..ecd48c59e 100644 --- a/src/Magnum/Resource.cpp +++ b/src/Magnum/Resource.cpp @@ -28,7 +28,6 @@ namespace Magnum { -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const ResourceState value) { debug << "ResourceState" << Debug::nospace; @@ -53,6 +52,5 @@ Debug& operator<<(Debug& debug, const ResourceState value) { Debug& operator<<(Debug& debug, const ResourceKey& value) { return debug << "ResourceKey(0x" << Debug::nospace << static_cast&>(value) << Debug::nospace << ")"; } -#endif } diff --git a/src/Magnum/Sampler.cpp b/src/Magnum/Sampler.cpp index ad352e854..924d19c50 100644 --- a/src/Magnum/Sampler.cpp +++ b/src/Magnum/Sampler.cpp @@ -30,7 +30,6 @@ namespace Magnum { -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const SamplerFilter value) { const bool packed = debug.immediateFlags() >= Debug::Flag::Packed; @@ -88,6 +87,5 @@ Debug& operator<<(Debug& debug, const SamplerWrapping value) { return debug << (packed ? "" : "(") << Debug::nospace << Debug::hex << UnsignedInt(value) << Debug::nospace << (packed ? "" : ")"); } -#endif } diff --git a/src/Magnum/SceneGraph/instantiation.cpp b/src/Magnum/SceneGraph/instantiation.cpp index 36c88c7e3..6078fa9ad 100644 --- a/src/Magnum/SceneGraph/instantiation.cpp +++ b/src/Magnum/SceneGraph/instantiation.cpp @@ -51,7 +51,6 @@ namespace Magnum { namespace SceneGraph { #define MAGNUM_SCENEGRAPH_EXPORT_HPP #endif -#ifndef DOXYGEN_GENERATING_OUTPUT template class MAGNUM_SCENEGRAPH_EXPORT_HPP AbstractObject<2, Float>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP AbstractObject<3, Float>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP AbstractTransformation<2, Float>; @@ -90,6 +89,5 @@ template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object>; -#endif }} diff --git a/src/Magnum/Text/Renderer.cpp b/src/Magnum/Text/Renderer.cpp index 96b0fd7f5..0d87bf6d6 100644 --- a/src/Magnum/Text/Renderer.cpp +++ b/src/Magnum/Text/Renderer.cpp @@ -714,10 +714,8 @@ void AbstractRenderer::render(const std::string& text) { _mesh.setCount(indexCount); } -#ifndef DOXYGEN_GENERATING_OUTPUT template class MAGNUM_TEXT_EXPORT Renderer<2>; template class MAGNUM_TEXT_EXPORT Renderer<3>; #endif -#endif }} diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp index fc85905ee..d5af911b9 100644 --- a/src/Magnum/Trade/AbstractImporter.cpp +++ b/src/Magnum/Trade/AbstractImporter.cpp @@ -1302,7 +1302,7 @@ Containers::String AbstractImporter::materialName(const UnsignedInt id) { Containers::String AbstractImporter::doMaterialName(UnsignedInt) { return {}; } -#if !defined(MAGNUM_BUILD_DEPRECATED) || defined(DOXYGEN_GENERATING_OUTPUT) +#ifndef MAGNUM_BUILD_DEPRECATED Containers::Optional #else Implementation::OptionalButAlsoPointer @@ -1329,7 +1329,7 @@ Containers::Optional AbstractImporter::doMaterial(UnsignedInt) { CORRADE_ASSERT_UNREACHABLE("Trade::AbstractImporter::material(): not implemented", {}); } -#if !defined(MAGNUM_BUILD_DEPRECATED) || defined(DOXYGEN_GENERATING_OUTPUT) +#ifndef MAGNUM_BUILD_DEPRECATED Containers::Optional #else Implementation::OptionalButAlsoPointer diff --git a/src/Magnum/Trade/ImageData.cpp b/src/Magnum/Trade/ImageData.cpp index 1751fe429..77c80fdbf 100644 --- a/src/Magnum/Trade/ImageData.cpp +++ b/src/Magnum/Trade/ImageData.cpp @@ -235,10 +235,8 @@ template Containers::Array ImageData:: return data; } -#ifndef DOXYGEN_GENERATING_OUTPUT template class MAGNUM_TRADE_EXPORT ImageData<1>; template class MAGNUM_TRADE_EXPORT ImageData<2>; template class MAGNUM_TRADE_EXPORT ImageData<3>; -#endif }} diff --git a/src/Magnum/Trade/LightData.cpp b/src/Magnum/Trade/LightData.cpp index 2da56626d..cd87cdcf9 100644 --- a/src/Magnum/Trade/LightData.cpp +++ b/src/Magnum/Trade/LightData.cpp @@ -66,7 +66,6 @@ LightData::LightData(const LightType type, const Color3& color, const Float inte LightData::LightData(const LightType type, const Color3& color, const Float intensity, const void* const importerState) noexcept: LightData{type, color, intensity, Constants::inf(), importerState} {} -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const LightType value) { const bool packed = debug.immediateFlags() >= Debug::Flag::Packed; @@ -86,6 +85,5 @@ Debug& operator<<(Debug& debug, const LightType value) { return debug << (packed ? "" : "(") << Debug::nospace << Debug::hex << UnsignedByte(value) << Debug::nospace << (packed ? "" : ")"); } -#endif }} diff --git a/src/Magnum/Trade/MaterialData.cpp b/src/Magnum/Trade/MaterialData.cpp index 02d16933e..458e1dc4a 100644 --- a/src/Magnum/Trade/MaterialData.cpp +++ b/src/Magnum/Trade/MaterialData.cpp @@ -42,7 +42,6 @@ namespace { using namespace Containers::Literals; -#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */ constexpr Containers::StringView LayerMap[]{ #define _c(name) #name ## _s, #include "Magnum/Trade/Implementation/materialLayerProperties.hpp" @@ -62,7 +61,6 @@ constexpr struct { #undef _ct #undef _cnt }; -#endif } @@ -255,7 +253,6 @@ const void* MaterialAttributeData::value() const { return _data.data + Implementation::MaterialAttributeDataSize - materialAttributeTypeSize(_data.type); } -#ifndef DOXYGEN_GENERATING_OUTPUT /* On Windows (MSVC, clang-cl and MinGw) it needs an explicit export otherwise the symbol doesn't get exported. */ template<> MAGNUM_TRADE_EXPORT Containers::StringView MaterialAttributeData::value() const { @@ -274,7 +271,6 @@ template<> MAGNUM_TRADE_EXPORT Containers::ArrayView MaterialAttribu const std::size_t size = *(nameEnd + 1); return {_data.data + Implementation::MaterialAttributeDataSize - size, size}; } -#endif MaterialData::MaterialData(const MaterialTypes types, Containers::Array&& attributeData, Containers::Array&& layerData, const void* const importerState) noexcept: _data{Utility::move(attributeData)}, _layerOffsets{Utility::move(layerData)}, _types{types}, _attributeDataFlags{DataFlag::Owned|DataFlag::Mutable}, _layerDataFlags{DataFlag::Owned|DataFlag::Mutable}, _importerState{importerState} { #ifndef CORRADE_NO_ASSERT @@ -1000,7 +996,6 @@ void* MaterialData::mutableAttribute(const MaterialLayer layer, const MaterialAt return mutableAttribute(string, name); } -#ifndef DOXYGEN_GENERATING_OUTPUT /* On Windows (MSVC, clang-cl and MinGw) it needs an explicit export otherwise the symbol doesn't get exported. */ template<> MAGNUM_TRADE_EXPORT Containers::StringView MaterialData::attribute(const UnsignedInt layer, const UnsignedInt id) const { @@ -1070,7 +1065,6 @@ template<> MAGNUM_TRADE_EXPORT Containers::ArrayView MaterialData::mutable const std::size_t size = *(nameEnd + 1); return {const_cast(data._data.data) + Implementation::MaterialAttributeDataSize - size, size}; } -#endif const void* MaterialData::findAttribute(const UnsignedInt layer, const Containers::StringView name) const { CORRADE_ASSERT(layer < layerCount(), diff --git a/src/Magnum/Trade/ObjectData2D.cpp b/src/Magnum/Trade/ObjectData2D.cpp index 90dc76fd9..77be220c0 100644 --- a/src/Magnum/Trade/ObjectData2D.cpp +++ b/src/Magnum/Trade/ObjectData2D.cpp @@ -102,7 +102,6 @@ Matrix3 ObjectData2D::transformation() const { return _transformation.matrix; } -#ifndef DOXYGEN_GENERATING_OUTPUT CORRADE_IGNORE_DEPRECATED_PUSH Debug& operator<<(Debug& debug, const ObjectInstanceType2D value) { debug << "Trade::ObjectInstanceType2D" << Debug::nospace; @@ -139,6 +138,5 @@ Debug& operator<<(Debug& debug, const ObjectFlags2D value) { ObjectFlag2D::HasTranslationRotationScaling}); } CORRADE_IGNORE_DEPRECATED_POP -#endif }} diff --git a/src/Magnum/Trade/ObjectData3D.cpp b/src/Magnum/Trade/ObjectData3D.cpp index ac3402995..a51ff1058 100644 --- a/src/Magnum/Trade/ObjectData3D.cpp +++ b/src/Magnum/Trade/ObjectData3D.cpp @@ -98,7 +98,6 @@ Matrix4 ObjectData3D::transformation() const { return _transformation.matrix; } -#ifndef DOXYGEN_GENERATING_OUTPUT CORRADE_IGNORE_DEPRECATED_PUSH Debug& operator<<(Debug& debug, const ObjectInstanceType3D value) { debug << "Trade::ObjectInstanceType3D" << Debug::nospace; @@ -136,6 +135,5 @@ Debug& operator<<(Debug& debug, const ObjectFlags3D value) { ObjectFlag3D::HasTranslationRotationScaling}); } CORRADE_IGNORE_DEPRECATED_POP -#endif }} diff --git a/src/Magnum/Trade/SkinData.cpp b/src/Magnum/Trade/SkinData.cpp index 00694f99a..fc3d19278 100644 --- a/src/Magnum/Trade/SkinData.cpp +++ b/src/Magnum/Trade/SkinData.cpp @@ -56,9 +56,7 @@ template Containers::Array; template class MAGNUM_TRADE_EXPORT SkinData<3>; -#endif }} diff --git a/src/Magnum/Trade/TextureData.cpp b/src/Magnum/Trade/TextureData.cpp index f1f16e68e..396c58382 100644 --- a/src/Magnum/Trade/TextureData.cpp +++ b/src/Magnum/Trade/TextureData.cpp @@ -28,7 +28,6 @@ namespace Magnum { namespace Trade { -#ifndef DOXYGEN_GENERATING_OUTPUT Debug& operator<<(Debug& debug, const TextureType value) { const bool packed = debug.immediateFlags() >= Debug::Flag::Packed; @@ -51,6 +50,5 @@ Debug& operator<<(Debug& debug, const TextureType value) { return debug << (packed ? "" : "(") << Debug::nospace << Debug::hex << UnsignedByte(value) << Debug::nospace << (packed ? "" : ")"); } -#endif }} diff --git a/src/Magnum/Vk/DeviceFeatures.cpp b/src/Magnum/Vk/DeviceFeatures.cpp index 4948374f0..e836d21fb 100644 --- a/src/Magnum/Vk/DeviceFeatures.cpp +++ b/src/Magnum/Vk/DeviceFeatures.cpp @@ -33,7 +33,6 @@ namespace Magnum { namespace Vk { namespace { -#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */ constexpr const char* FeatureNames[] { #define _c(value, field) #value, #define _cver(value, field, suffix, version) _c(value, field) @@ -43,7 +42,6 @@ constexpr const char* FeatureNames[] { #undef _cver #undef _cext }; -#endif } diff --git a/src/Magnum/Vk/VertexFormat.cpp b/src/Magnum/Vk/VertexFormat.cpp index 30df6228e..4498090fb 100644 --- a/src/Magnum/Vk/VertexFormat.cpp +++ b/src/Magnum/Vk/VertexFormat.cpp @@ -34,7 +34,6 @@ namespace Magnum { namespace Vk { namespace { -#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */ constexpr VertexFormat VertexFormatMapping[] { /* GCC 4.8 doesn't like just a {} for default enum values */ #define _c(input, output) VertexFormat::output, @@ -43,7 +42,6 @@ constexpr VertexFormat VertexFormatMapping[] { #undef _s #undef _c }; -#endif }