Browse Source

Remove Doxygen workarounds from *.cpp files.

They're not parsed since 6b22a11170
(2020), so there's no point in keeping those workarounds. They're only
kept in utility application sources as they're parsed for pages, and in
tweakable implementations where it's easier to just copypaste the whole
ifdef expression from the header every time instead of modifying it to
not include DOXYGEN_GENERATING_OUTPUT.
pull/651/merge
Vladimír Vondruš 1 year ago
parent
commit
e9dcaf9532
  1. 2
      src/Magnum/Animation/Interpolation.cpp
  2. 2
      src/Magnum/Animation/Player.cpp
  3. 2
      src/Magnum/Audio/Listener.cpp
  4. 2
      src/Magnum/Audio/Playable.cpp
  5. 2
      src/Magnum/Audio/PlayableGroup.cpp
  6. 3
      src/Magnum/DebugTools/ObjectRenderer.cpp
  7. 2
      src/Magnum/GL/AbstractQuery.cpp
  8. 13
      src/Magnum/GL/AbstractTexture.cpp
  9. 2
      src/Magnum/GL/Buffer.cpp
  10. 2
      src/Magnum/GL/BufferImage.cpp
  11. 2
      src/Magnum/GL/Context.cpp
  12. 6
      src/Magnum/GL/DebugOutput.cpp
  13. 2
      src/Magnum/GL/DefaultFramebuffer.cpp
  14. 2
      src/Magnum/GL/Framebuffer.cpp
  15. 2
      src/Magnum/GL/Mesh.cpp
  16. 2
      src/Magnum/GL/MultisampleTexture.cpp
  17. 6
      src/Magnum/GL/PixelFormat.cpp
  18. 2
      src/Magnum/GL/Renderer.cpp
  19. 2
      src/Magnum/GL/Sampler.cpp
  20. 2
      src/Magnum/GL/Shader.cpp
  21. 6
      src/Magnum/GL/Test/AbstractShaderProgramGLTest.cpp
  22. 6
      src/Magnum/GL/Test/MeshGLTest.cpp
  23. 2
      src/Magnum/GL/Test/SampleQueryGLTest.cpp
  24. 2
      src/Magnum/GL/Texture.cpp
  25. 2
      src/Magnum/GL/TextureArray.cpp
  26. 2
      src/Magnum/GL/TextureFormat.cpp
  27. 2
      src/Magnum/GL/Version.cpp
  28. 2
      src/Magnum/Image.cpp
  29. 2
      src/Magnum/ImageView.cpp
  30. 4
      src/Magnum/Math/instantiation.cpp
  31. 2
      src/Magnum/Mesh.cpp
  32. 10
      src/Magnum/PixelFormat.cpp
  33. 2
      src/Magnum/Platform/WindowlessWglApplication.cpp
  34. 2
      src/Magnum/Resource.cpp
  35. 2
      src/Magnum/Sampler.cpp
  36. 2
      src/Magnum/SceneGraph/instantiation.cpp
  37. 2
      src/Magnum/Text/Renderer.cpp
  38. 4
      src/Magnum/Trade/AbstractImporter.cpp
  39. 2
      src/Magnum/Trade/ImageData.cpp
  40. 2
      src/Magnum/Trade/LightData.cpp
  41. 6
      src/Magnum/Trade/MaterialData.cpp
  42. 2
      src/Magnum/Trade/ObjectData2D.cpp
  43. 2
      src/Magnum/Trade/ObjectData3D.cpp
  44. 2
      src/Magnum/Trade/SkinData.cpp
  45. 2
      src/Magnum/Trade/TextureData.cpp
  46. 2
      src/Magnum/Vk/DeviceFeatures.cpp
  47. 2
      src/Magnum/Vk/VertexFormat.cpp

2
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 {

2
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<Float, Float>;
template class MAGNUM_EXPORT_HPP Player<std::chrono::nanoseconds, Float>;
#endif
}}

2
src/Magnum/Audio/Listener.cpp

@ -119,9 +119,7 @@ template<UnsignedInt dimensions> bool Listener<dimensions>::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
}}

2
src/Magnum/Audio/Playable.cpp

@ -77,9 +77,7 @@ template<UnsignedInt dimensions> void Playable<dimensions>::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
}}

2
src/Magnum/Audio/PlayableGroup.cpp

@ -93,9 +93,7 @@ template<UnsignedInt dimensions> PlayableGroup<dimensions>& PlayableGroup<dimens
#define MAGNUM_AUDIO_EXPORT_HPP
#endif
#ifndef DOXYGEN_GENERATING_OUTPUT
template class MAGNUM_AUDIO_EXPORT_HPP PlayableGroup<2>;
template class MAGNUM_AUDIO_EXPORT_HPP PlayableGroup<3>;
#endif
}}

3
src/Magnum/DebugTools/ObjectRenderer.cpp

@ -54,8 +54,7 @@ template<> struct Renderer<3> {
}
/* Doxygen gets confused when using {} to initialize parent object */
template<UnsignedInt dimensions> ObjectRenderer<dimensions>::ObjectRenderer(ResourceManager& manager, SceneGraph::AbstractObject<dimensions, Float>& object, ResourceKey options, SceneGraph::DrawableGroup<dimensions, Float>* drawables): SceneGraph::Drawable<dimensions, Float>(object, drawables), _options{manager.get<ObjectRendererOptions>(options)} {
template<UnsignedInt dimensions> ObjectRenderer<dimensions>::ObjectRenderer(ResourceManager& manager, SceneGraph::AbstractObject<dimensions, Float>& object, ResourceKey options, SceneGraph::DrawableGroup<dimensions, Float>* drawables): SceneGraph::Drawable<dimensions, Float>{object, drawables}, _options{manager.get<ObjectRendererOptions>(options)} {
/* Shader */
_shader = manager.get<GL::AbstractShaderProgram, Shaders::VertexColorGL<dimensions>>(Renderer<dimensions>::shader());
if(!_shader) manager.set<GL::AbstractShaderProgram>(_shader.key(), new Shaders::VertexColorGL<dimensions>);

2
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>() {
UnsignedInt result;
#ifndef MAGNUM_TARGET_GLES2
@ -165,7 +164,6 @@ template<> Long AbstractQuery::result<Long>() {
#endif
return result;
}
#endif
void AbstractQuery::begin() {
#ifndef MAGNUM_TARGET_GLES2

13
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<AbstractTexture* const> textures) {
void AbstractTexture::bindImplementationMulti(const GLint firstTextureUnit, const Containers::ArrayView<AbstractTexture* const> 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(*original)(AbstractTexture&, GLint, const Vector2i&, const Vector2i&, PixelFormat, PixelType, const GLvoid*, const PixelStorage&)> 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(*original)(AbstractTexture&, GLint, const Vector3i&, const Vector3i&, PixelFormat, PixelType, const GLvoid*, const PixelStorage&)> 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<UnsignedInt dimensions> void AbstractTexture::image(const GLint level, Image<dimensions>& image, const ImageFlags<dimensions> flags) {
const Math::Vector<dimensions, Int> size = DataHelper<dimensions>::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
}}

2
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
}}

2
src/Magnum/GL/BufferImage.cpp

@ -155,7 +155,6 @@ template<UnsignedInt dimensions> Buffer CompressedBufferImage<dimensions>::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
}}

2
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
}}

6
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<Extensions::KHR::debug>())
@ -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

2
src/Magnum/GL/DefaultFramebuffer.cpp

@ -126,7 +126,6 @@ void DefaultFramebuffer::invalidate(std::initializer_list<InvalidationAttachment
}
#endif
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const DefaultFramebuffer::Status value) {
debug << "GL::DefaultFramebuffer::Status" << Debug::nospace;
@ -143,6 +142,5 @@ Debug& operator<<(Debug& debug, const DefaultFramebuffer::Status value) {
return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")";
}
#endif
}}

2
src/Magnum/GL/Framebuffer.cpp

@ -455,7 +455,6 @@ void Framebuffer::parameterImplementationDSA(Framebuffer& self, const GLenum par
}
#endif
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const Framebuffer::Status value) {
debug << "GL::Framebuffer::Status" << Debug::nospace;
@ -485,6 +484,5 @@ Debug& operator<<(Debug& debug, const Framebuffer::Status value) {
return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")";
}
#endif
}}

2
src/Magnum/GL/Mesh.cpp

@ -118,7 +118,6 @@ UnsignedInt meshIndexTypeSize(const MeshIndexType type) {
CORRADE_ASSERT_UNREACHABLE("GL::meshIndexTypeSize(): invalid type" << type, {});
}
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const MeshPrimitive value) {
debug << "GL::MeshPrimitive" << Debug::nospace;
@ -163,7 +162,6 @@ Debug& operator<<(Debug& debug, const MeshIndexType value) {
return debug << "(" << Debug::nospace << Debug::hex << GLenum(value) << Debug::nospace << ")";
}
#endif
struct Mesh::AttributeLayout {
/* Records attribute layout with a non-owning Buffer reference. Used as a

2
src/Magnum/GL/MultisampleTexture.cpp

@ -105,7 +105,6 @@ template<UnsignedInt dimensions> MultisampleTexture<dimensions>& 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

6
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<Magnum::PixelFormat> 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
}}

2
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
}}

2
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
}}

2
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
}}

6
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<Extensions::ARB::gpu_shader_fp64>())
@ -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

6
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<class T> T Checker::get(PixelFormat format, PixelType type) {
return Containers::arrayCast<T>(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()];

2
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

2
src/Magnum/GL/Texture.cpp

@ -182,7 +182,6 @@ template<UnsignedInt dimensions> Texture<dimensions>& Texture<dimensions>::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
}}

2
src/Magnum/GL/TextureArray.cpp

@ -161,7 +161,6 @@ template<UnsignedInt dimensions> TextureArray<dimensions>& TextureArray<dimensio
}
#endif
#ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef MAGNUM_TARGET_GLES
template class
/* GCC needs the export macro on the class definition (and here it warns
@ -177,7 +176,6 @@ template class
MAGNUM_GL_EXPORT
#endif
TextureArray<2>;
#endif
}}
#endif

2
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
}}

2
src/Magnum/GL/Version.cpp

@ -40,7 +40,6 @@ Containers::Pair<Int, Int> 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
}}

2
src/Magnum/Image.cpp

@ -134,7 +134,6 @@ template<UnsignedInt dimensions> Containers::Array<char> CompressedImage<dimensi
return data;
}
#ifndef DOXYGEN_GENERATING_OUTPUT
template class MAGNUM_EXPORT Image<1>;
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
}

2
src/Magnum/ImageView.cpp

@ -86,7 +86,6 @@ template<UnsignedInt dimensions, class T> std::pair<VectorTypeFor<dimensions, st
return Implementation::compressedImageDataProperties<dimensions>(*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
}

4
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<Magnum::Math::Range<3,
vectors instantiated above */
template struct MAGNUM_EXPORT_TEMPLATE ConfigurationValue<Magnum::Math::DualQuaternion<Magnum::Float>>;
template struct MAGNUM_EXPORT_TEMPLATE ConfigurationValue<Magnum::Math::DualQuaternion<Magnum::Double>>;
#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
}}

2
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),

10
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
}

2
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 {

2
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<const Utility::HashDigest<sizeof(std::size_t)>&>(value) << Debug::nospace << ")";
}
#endif
}

2
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
}

2
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<BasicTranslationRotationScali
template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<BasicTranslationRotationScalingTransformation3D<Float>>;
template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<TranslationTransformation<2, Float>>;
template class MAGNUM_SCENEGRAPH_EXPORT_HPP Object<TranslationTransformation<3, Float>>;
#endif
}}

2
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
}}

4
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<MaterialData>
#else
Implementation::OptionalButAlsoPointer<MaterialData>
@ -1329,7 +1329,7 @@ Containers::Optional<MaterialData> 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<MaterialData>
#else
Implementation::OptionalButAlsoPointer<MaterialData>

2
src/Magnum/Trade/ImageData.cpp

@ -235,10 +235,8 @@ template<UnsignedInt dimensions> Containers::Array<char> ImageData<dimensions>::
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
}}

2
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
}}

6
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<Containers::StringView>() const {
@ -274,7 +271,6 @@ template<> MAGNUM_TRADE_EXPORT Containers::ArrayView<const void> MaterialAttribu
const std::size_t size = *(nameEnd + 1);
return {_data.data + Implementation::MaterialAttributeDataSize - size, size};
}
#endif
MaterialData::MaterialData(const MaterialTypes types, Containers::Array<MaterialAttributeData>&& attributeData, Containers::Array<UnsignedInt>&& 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<Containers::StringView>(const UnsignedInt layer, const UnsignedInt id) const {
@ -1070,7 +1065,6 @@ template<> MAGNUM_TRADE_EXPORT Containers::ArrayView<void> MaterialData::mutable
const std::size_t size = *(nameEnd + 1);
return {const_cast<char*>(data._data.data) + Implementation::MaterialAttributeDataSize - size, size};
}
#endif
const void* MaterialData::findAttribute(const UnsignedInt layer, const Containers::StringView name) const {
CORRADE_ASSERT(layer < layerCount(),

2
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
}}

2
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
}}

2
src/Magnum/Trade/SkinData.cpp

@ -56,9 +56,7 @@ template<UnsignedInt dimensions> Containers::Array<MatrixTypeFor<dimensions, Flo
return Utility::move(_inverseBindMatrixData);
}
#ifndef DOXYGEN_GENERATING_OUTPUT
template class MAGNUM_TRADE_EXPORT SkinData<2>;
template class MAGNUM_TRADE_EXPORT SkinData<3>;
#endif
}}

2
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
}}

2
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
}

2
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
}

Loading…
Cancel
Save