ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Reduce string duplication in enum debug output operators. 

Bloaty says it saved 10 kB in Debug build of MagnumGL:

     VM SIZE                     FILE SIZE
 --------------               --------------
  [ = ]       0 .debug_info   +1.59Ki  +0.0%
  +0.4% +1.50Ki .text         +1.50Ki  +0.4%
  [ = ]       0 .debug_str       +409  +0.0%
  [ = ]       0 .debug_line      +276  +0.1%
  [ = ]       0 .debug_abbrev     +20  +0.0%
 -28.6%      -2 [LOAD [RX]]        -2 -28.6%
  [ = ]       0 [Unmapped]    -4.28Ki -41.0%
 -22.7% -9.23Ki .rodata       -9.23Ki -22.7%
  -0.8% -7.73Ki TOTAL         -9.73Ki  -0.1%

And 4 kB in Release:

     VM SIZE                  FILE SIZE
 --------------            --------------
  +1.1% +3.44Ki .text      +3.44Ki  +1.1%
  +1.7% +1.39Ki .eh_frame  +1.39Ki  +1.7%
  [ = ]       0 [Unmapped]    +656   +51%
 -25.5% -9.47Ki .rodata    -9.47Ki -25.5%
  -0.7% -4.64Ki TOTAL      -4.00Ki  -0.4%

That's not negative, so I guess that's good. This change is of course
more significant in the context of a minimal WebGL build, where the exe
can be as little as 50 kB -- there 4 kB is almost 10% of the size.
pull/392/head
Vladimír Vondruš 7 years ago
parent
f4e409bfd9
commit
98232f383a
39 changed files with 354 additions and 196 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/Magnum/Animation/Interpolation.cpp
  2. 6
      src/Magnum/Animation/Player.cpp
  3. 6
      src/Magnum/Audio/AbstractImporter.cpp
  4. 6
      src/Magnum/Audio/BufferFormat.cpp
  5. 6
      src/Magnum/Audio/Context.cpp
  6. 12
      src/Magnum/Audio/Renderer.cpp
  7. 12
      src/Magnum/Audio/Source.cpp
  8. 6
      src/Magnum/FileCallback.cpp
  9. 148
      src/Magnum/GL/Attribute.cpp
  10. 16
      src/Magnum/GL/Buffer.cpp
  11. 12
      src/Magnum/GL/Context.cpp
  12. 36
      src/Magnum/GL/DebugOutput.cpp
  13. 6
      src/Magnum/GL/DefaultFramebuffer.cpp
  14. 6
      src/Magnum/GL/Framebuffer.cpp
  15. 16
      src/Magnum/GL/Mesh.cpp
  16. 18
      src/Magnum/GL/PixelFormat.cpp
  17. 18
      src/Magnum/GL/Renderer.cpp
  18. 36
      src/Magnum/GL/Sampler.cpp
  19. 6
      src/Magnum/GL/Shader.cpp
  20. 6
      src/Magnum/GL/TextureFormat.cpp
  21. 2
      src/Magnum/GL/Version.cpp
  22. 6
      src/Magnum/Resource.cpp
  23. 18
      src/Magnum/Sampler.cpp
  24. 8
      src/Magnum/SceneGraph/Animable.cpp
  25. 6
      src/Magnum/Shaders/Flat.cpp
  26. 6
      src/Magnum/Shaders/MeshVisualizer.cpp
  27. 6
      src/Magnum/Shaders/Phong.cpp
  28. 6
      src/Magnum/Text/AbstractFont.cpp
  29. 6
      src/Magnum/Trade/AbstractImageConverter.cpp
  30. 6
      src/Magnum/Trade/AbstractImporter.cpp
  31. 18
      src/Magnum/Trade/AbstractMaterialData.cpp
  32. 6
      src/Magnum/Trade/AnimationData.cpp
  33. 6
      src/Magnum/Trade/CameraData.cpp
  34. 6
      src/Magnum/Trade/LightData.cpp
  35. 18
      src/Magnum/Trade/ObjectData2D.cpp
  36. 18
      src/Magnum/Trade/ObjectData3D.cpp
  37. 6
      src/Magnum/Trade/PhongMaterialData.cpp
  38. 6
      src/Magnum/Trade/TextureData.cpp
  39. 6
      src/MagnumPlugins/WavAudioImporter/WavHeader.cpp

12
src/Magnum/Animation/Interpolation.cpp
Unescape View File

@ -32,9 +32,11 @@ namespace Magnum { namespace Animation {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const Interpolation value) {
debug << "Animation::Interpolation" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Interpolation::value: return debug << "Animation::Interpolation::" #value;
#define _c(value) case Interpolation::value: return debug << "::" #value;
_c(Constant)
_c(Linear)
_c(Spline)
@ -43,13 +45,15 @@ Debug& operator<<(Debug& debug, const Interpolation value) {
/* LCOV_EXCL_STOP */
}
return debug << "Animation::Interpolation(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const Extrapolation value) {
debug << "Animation::Extrapolation" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Extrapolation::value: return debug << "Animation::Extrapolation::" #value;
#define _c(value) case Extrapolation::value: return debug << "::" #value;
_c(DefaultConstructed)
_c(Constant)
_c(Extrapolated)
@ -57,7 +61,7 @@ Debug& operator<<(Debug& debug, const Extrapolation value) {
/* LCOV_EXCL_STOP */
}
return debug << "Animation::Extrapolation(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
#endif

6
src/Magnum/Animation/Player.cpp
Unescape View File

@ -28,9 +28,11 @@
namespace Magnum { namespace Animation {
Debug& operator<<(Debug& debug, const State value) {
debug << "Animation::State" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case State::value: return debug << "Animation::State::" #value;
#define _c(value) case State::value: return debug << "::" #value;
_c(Stopped)
_c(Playing)
_c(Paused)
@ -38,7 +40,7 @@ Debug& operator<<(Debug& debug, const State value) {
/* LCOV_EXCL_STOP */
}
return debug << "Animation::State(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
/* On non-MinGW Windows the instantiations are already marked with extern

6
src/Magnum/Audio/AbstractImporter.cpp
Unescape View File

@ -126,15 +126,17 @@ Containers::Array<char> AbstractImporter::data() {
}
Debug& operator<<(Debug& debug, const AbstractImporter::Feature value) {
debug << "Audio::AbstractImporter::Feature" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case AbstractImporter::Feature::v: return debug << "Audio::AbstractImporter::Feature::" #v;
#define _c(v) case AbstractImporter::Feature::v: return debug << "::" #v;
_c(OpenData)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "Audio::AbstractImporter::Feature(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const AbstractImporter::Features value) {

6
src/Magnum/Audio/BufferFormat.cpp
Unescape View File

@ -30,9 +30,11 @@
namespace Magnum { namespace Audio {
Debug& operator<<(Debug& debug, const BufferFormat value) {
debug << "Audio::BufferFormat" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case BufferFormat::value: return debug << "Audio::BufferFormat::" #value;
#define _c(value) case BufferFormat::value: return debug << "::" #value;
_c(Mono8)
_c(Mono16)
_c(Stereo8)
@ -73,7 +75,7 @@ Debug& operator<<(Debug& debug, const BufferFormat value) {
/* LCOV_EXCL_STOP */
}
return debug << "Audio::BufferFormat(" << Debug::nospace << reinterpret_cast<void*>(ALenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(ALenum(value)) << Debug::nospace << ")";
}
}}

6
src/Magnum/Audio/Context.cpp
Unescape View File

@ -71,9 +71,11 @@ Containers::ArrayView<const Extension> Extension::extensions() {
}
Debug& operator<<(Debug& debug, const Context::HrtfStatus value) {
debug << "Audio::Context::HrtfStatus" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Context::HrtfStatus::value: return debug << "Audio::Context::HrtfStatus::" #value;
#define _c(value) case Context::HrtfStatus::value: return debug << "::" #value;
_c(Disabled)
_c(Enabled)
_c(Denied)
@ -84,7 +86,7 @@ Debug& operator<<(Debug& debug, const Context::HrtfStatus value) {
/* LCOV_EXCL_STOP */
}
return debug << "Audio::Context::HrtfStatus(" << Debug::nospace << reinterpret_cast<void*>(ALenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(ALenum(value)) << Debug::nospace << ")";
}
namespace {

12
src/Magnum/Audio/Renderer.cpp
Unescape View File

@ -30,9 +30,11 @@
namespace Magnum { namespace Audio {
Debug& operator<<(Debug& debug, const Renderer::Error value) {
debug << "Audio::Renderer::Error" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Renderer::Error::value: return debug << "Audio::Renderer::Error::" #value;
#define _c(value) case Renderer::Error::value: return debug << "::" #value;
_c(NoError)
_c(InvalidName)
_c(InvalidEnum)
@ -43,13 +45,15 @@ Debug& operator<<(Debug& debug, const Renderer::Error value) {
/* LCOV_EXCL_STOP */
}
return debug << "Audio::Renderer::Error(" << Debug::nospace << reinterpret_cast<void*>(ALenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(ALenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const Renderer::DistanceModel value) {
debug << "Audio::Renderer::DistanceModel" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Renderer::DistanceModel::value: return debug << "Audio::Renderer::DistanceModel::" #value;
#define _c(value) case Renderer::DistanceModel::value: return debug << "::" #value;
_c(None)
_c(Inverse)
_c(InverseClamped)
@ -61,7 +65,7 @@ Debug& operator<<(Debug& debug, const Renderer::DistanceModel value) {
/* LCOV_EXCL_STOP */
}
return debug << "Audio::Renderer::DistanceModel(" << Debug::nospace << reinterpret_cast<void*>(ALenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(ALenum(value)) << Debug::nospace << ")";
}
}}

12
src/Magnum/Audio/Source.cpp
Unescape View File

@ -126,9 +126,11 @@ void Source::rewind(const std::vector<std::reference_wrapper<Source>>& sources)
}
Debug& operator<<(Debug& debug, const Source::State value) {
debug << "Audio::Source::State" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Source::State::value: return debug << "Audio::Source::State::" #value;
#define _c(value) case Source::State::value: return debug << "::" #value;
_c(Initial)
_c(Playing)
_c(Paused)
@ -137,13 +139,15 @@ Debug& operator<<(Debug& debug, const Source::State value) {
/* LCOV_EXCL_STOP */
}
return debug << "Audio::Source::State(" << Debug::nospace << reinterpret_cast<void*>(ALint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(ALint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const Source::Type value) {
debug << "Audio::Source::Type" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Source::Type::value: return debug << "Audio::Source::Type::" #value;
#define _c(value) case Source::Type::value: return debug << "::" #value;
_c(Undetermined)
_c(Static)
_c(Streaming)
@ -151,7 +155,7 @@ Debug& operator<<(Debug& debug, const Source::Type value) {
/* LCOV_EXCL_STOP */
}
return debug << "Audio::Source::Type(" << Debug::nospace << reinterpret_cast<void*>(ALint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(ALint(value)) << Debug::nospace << ")";
}
}}

6
src/Magnum/FileCallback.cpp
Unescape View File

@ -30,9 +30,11 @@
namespace Magnum {
Debug& operator<<(Debug& debug, const InputFileCallbackPolicy value) {
debug << "InputFileCallbackPolicy" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case InputFileCallbackPolicy::v: return debug << "InputFileCallbackPolicy::" #v;
#define _c(v) case InputFileCallbackPolicy::v: return debug << "::" #v;
_c(LoadTemporary)
_c(LoadPermanent)
_c(Close)
@ -40,7 +42,7 @@ Debug& operator<<(Debug& debug, const InputFileCallbackPolicy value) {
/* LCOV_EXCL_STOP */
}
return debug << "InputFileCallbackPolicy(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
}

148
src/Magnum/GL/Attribute.cpp
Unescape View File

@ -30,10 +30,12 @@
namespace Magnum { namespace GL {
Debug& operator<<(Debug& debug, DynamicAttribute::Kind value) {
Debug& operator<<(Debug& debug, const DynamicAttribute::Kind value) {
debug << "GL::DynamicAttribute::Kind" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DynamicAttribute::Kind::value: return debug << "GL::DynamicAttribute::Kind::" #value;
#define _c(value) case DynamicAttribute::Kind::value: return debug << "::" #value;
_c(Generic)
_c(GenericNormalized)
#ifndef MAGNUM_TARGET_GLES2
@ -46,13 +48,15 @@ Debug& operator<<(Debug& debug, DynamicAttribute::Kind value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::DynamicAttribute::Kind(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, DynamicAttribute::Components value) {
Debug& operator<<(Debug& debug, const DynamicAttribute::Components value) {
debug << "GL::DynamicAttribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DynamicAttribute::Components::value: return debug << "GL::DynamicAttribute::Components::" #value;
#define _c(value) case DynamicAttribute::Components::value: return debug << "::" #value;
_c(One)
_c(Two)
_c(Three)
@ -64,13 +68,15 @@ Debug& operator<<(Debug& debug, DynamicAttribute::Components value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::DynamicAttribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, DynamicAttribute::DataType value) {
Debug& operator<<(Debug& debug, const DynamicAttribute::DataType value) {
debug << "GL::DynamicAttribute::DataType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DynamicAttribute::DataType::value: return debug << "GL::DynamicAttribute::DataType::" #value;
#define _c(value) case DynamicAttribute::DataType::value: return debug << "::" #value;
_c(UnsignedByte)
_c(Byte)
_c(UnsignedShort)
@ -93,7 +99,7 @@ Debug& operator<<(Debug& debug, DynamicAttribute::DataType value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::DynamicAttribute::DataType(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
namespace Implementation {
@ -213,120 +219,138 @@ UnsignedInt Attribute<Math::Vector<4, Float>>::size(GLint components, DataType d
CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */
}
Debug& operator<<(Debug& debug, SizedAttribute<1, 1>::Components value) {
Debug& operator<<(Debug& debug, const SizedAttribute<1, 1>::Components value) {
debug << "GL::Attribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
case SizedAttribute<1, 1>::Components::One:
return debug << "GL::Attribute::Components::One";
return debug << "::One";
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, SizedAttribute<1, 2>::Components value) {
Debug& operator<<(Debug& debug, const SizedAttribute<1, 2>::Components value) {
debug << "GL::Attribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
case SizedAttribute<1, 2>::Components::One:
return debug << "GL::Attribute::Components::One";
return debug << "::One";
case SizedAttribute<1, 2>::Components::Two:
return debug << "GL::Attribute::Components::Two";
return debug << "::Two";
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, SizedAttribute<1, 3>::Components value) {
Debug& operator<<(Debug& debug, const SizedAttribute<1, 3>::Components value) {
debug << "GL::Attribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
case SizedAttribute<1, 3>::Components::One:
return debug << "GL::Attribute::Components::One";
return debug << "::One";
case SizedAttribute<1, 3>::Components::Two:
return debug << "GL::Attribute::Components::Two";
return debug << "::Two";
case SizedAttribute<1, 3>::Components::Three:
return debug << "GL::Attribute::Components::Three";
return debug << "::Three";
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, SizedAttribute<1, 4>::Components value) {
Debug& operator<<(Debug& debug, const SizedAttribute<1, 4>::Components value) {
debug << "GL::Attribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
case SizedAttribute<1, 4>::Components::One:
return debug << "GL::Attribute::Components::One";
return debug << "::One";
case SizedAttribute<1, 4>::Components::Two:
return debug << "GL::Attribute::Components::Two";
return debug << "::Two";
case SizedAttribute<1, 4>::Components::Three:
return debug << "GL::Attribute::Components::Three";
return debug << "::Three";
case SizedAttribute<1, 4>::Components::Four:
return debug << "GL::Attribute::Components::Four";
return debug << "::Four";
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, SizedMatrixAttribute<2>::Components value) {
Debug& operator<<(Debug& debug, const SizedMatrixAttribute<2>::Components value) {
debug << "GL::Attribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
case SizedMatrixAttribute<2>::Components::Two:
return debug << "GL::Attribute::Components::Two";
return debug << "::Two";
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, SizedMatrixAttribute<3>::Components value) {
Debug& operator<<(Debug& debug, const SizedMatrixAttribute<3>::Components value) {
debug << "GL::Attribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
case SizedMatrixAttribute<3>::Components::Three:
return debug << "GL::Attribute::Components::Three";
return debug << "::Three";
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, SizedMatrixAttribute<4>::Components value) {
Debug& operator<<(Debug& debug, const SizedMatrixAttribute<4>::Components value) {
debug << "GL::Attribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
case SizedMatrixAttribute<4>::Components::Four:
return debug << "GL::Attribute::Components::Four";
return debug << "::Four";
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, Attribute<Math::Vector<4, Float>>::Components value) {
Debug& operator<<(Debug& debug, const Attribute<Math::Vector<4, Float>>::Components value) {
debug << "GL::Attribute::Components" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
case Attribute<Math::Vector<4, Float>>::Components::One:
return debug << "GL::Attribute::Components::One";
return debug << "::One";
case Attribute<Math::Vector<4, Float>>::Components::Two:
return debug << "GL::Attribute::Components::Two";
return debug << "::Two";
case Attribute<Math::Vector<4, Float>>::Components::Three:
return debug << "GL::Attribute::Components::Three";
return debug << "::Three";
case Attribute<Math::Vector<4, Float>>::Components::Four:
return debug << "GL::Attribute::Components::Four";
return debug << "::Four";
#ifndef MAGNUM_TARGET_GLES
case Attribute<Math::Vector<4, Float>>::Components::BGRA:
return debug << "GL::Attribute::Components::BGRA";
return debug << "::BGRA";
#endif
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::Components(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, FloatAttribute::DataType value) {
Debug& operator<<(Debug& debug, const FloatAttribute::DataType value) {
debug << "GL::Attribute::DataType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case FloatAttribute::DataType::value: return debug << "GL::Attribute::DataType::" #value;
#define _c(value) case FloatAttribute::DataType::value: return debug << "::" #value;
_c(UnsignedByte)
_c(Byte)
_c(UnsignedShort)
@ -344,14 +368,16 @@ Debug& operator<<(Debug& debug, FloatAttribute::DataType value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::DataType(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#ifndef MAGNUM_TARGET_GLES2
Debug& operator<<(Debug& debug, IntAttribute::DataType value) {
Debug& operator<<(Debug& debug, const IntAttribute::DataType value) {
debug << "GL::Attribute::DataType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case IntAttribute::DataType::value: return debug << "GL::Attribute::DataType::" #value;
#define _c(value) case IntAttribute::DataType::value: return debug << "::" #value;
_c(UnsignedByte)
_c(Byte)
_c(UnsignedShort)
@ -362,28 +388,32 @@ Debug& operator<<(Debug& debug, IntAttribute::DataType value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::DataType(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif
#ifndef MAGNUM_TARGET_GLES
Debug& operator<<(Debug& debug, DoubleAttribute::DataType value) {
Debug& operator<<(Debug& debug, const DoubleAttribute::DataType value) {
debug << "GL::Attribute::DataType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DoubleAttribute::DataType::value: return debug << "GL::Attribute::DataType::" #value;
#define _c(value) case DoubleAttribute::DataType::value: return debug << "::" #value;
_c(Double)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::DataType(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif
Debug& operator<<(Debug& debug, Attribute<Math::Vector<3, Float>>::DataType value) {
Debug& operator<<(Debug& debug, const Attribute<Math::Vector<3, Float>>::DataType value) {
debug << "GL::Attribute::DataType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Attribute<Math::Vector<3, Float>>::DataType::value: return debug << "GL::Attribute::DataType::" #value;
#define _c(value) case Attribute<Math::Vector<3, Float>>::DataType::value: return debug << "::" #value;
_c(UnsignedByte)
_c(Byte)
_c(UnsignedShort)
@ -402,13 +432,15 @@ Debug& operator<<(Debug& debug, Attribute<Math::Vector<3, Float>>::DataType valu
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::DataType(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, Attribute<Math::Vector<4, Float>>::DataType value) {
Debug& operator<<(Debug& debug, const Attribute<Math::Vector<4, Float>>::DataType value) {
debug << "GL::Attribute::DataType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Attribute<Math::Vector<4, Float>>::DataType::value: return debug << "GL::Attribute::DataType::" #value;
#define _c(value) case Attribute<Math::Vector<4, Float>>::DataType::value: return debug << "::" #value;
_c(UnsignedByte)
_c(Byte)
_c(UnsignedShort)
@ -430,7 +462,7 @@ Debug& operator<<(Debug& debug, Attribute<Math::Vector<4, Float>>::DataType valu
/* LCOV_EXCL_STOP */
}
return debug << "GL::Attribute::DataType(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
}

16
src/Magnum/GL/Buffer.cpp
Unescape View File

@ -559,10 +559,12 @@ bool Buffer::unmapImplementationDSA() {
#endif
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, Buffer::TargetHint value) {
Debug& operator<<(Debug& debug, const Buffer::TargetHint value) {
debug << "GL::Buffer::TargetHint" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Buffer::TargetHint::value: return debug << "GL::Buffer::TargetHint::" #value;
#define _c(value) case Buffer::TargetHint::value: return debug << "::" #value;
_c(Array)
#ifndef MAGNUM_TARGET_GLES2
#ifndef MAGNUM_TARGET_WEBGL
@ -594,13 +596,15 @@ Debug& operator<<(Debug& debug, Buffer::TargetHint value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Buffer::TargetHint(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#ifndef MAGNUM_TARGET_GLES2
Debug& operator<<(Debug& debug, Buffer::Target value) {
Debug& operator<<(Debug& debug, const Buffer::Target value) {
debug << "GL::Buffer::Target" << Debug::nospace;
switch(value) {
#define _c(value) case Buffer::Target::value: return debug << "GL::Buffer::Target::" #value;
#define _c(value) case Buffer::Target::value: return debug << "::" #value;
#ifndef MAGNUM_TARGET_WEBGL
_c(AtomicCounter)
_c(ShaderStorage)
@ -609,7 +613,7 @@ Debug& operator<<(Debug& debug, Buffer::Target value) {
#undef _c
}
return debug << "GL::Buffer::Target(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif
#endif

12
src/Magnum/GL/Context.cpp
Unescape View File

@ -1036,9 +1036,11 @@ void Context::resetState(const States states) {
#ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef MAGNUM_TARGET_WEBGL
Debug& operator<<(Debug& debug, const Context::Flag value) {
debug << "GL::Context::Flag" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Context::Flag::value: return debug << "GL::Context::Flag::" #value;
#define _c(value) case Context::Flag::value: return debug << "::" #value;
_c(Debug)
#ifndef MAGNUM_TARGET_GLES
_c(ForwardCompatible)
@ -1051,7 +1053,7 @@ Debug& operator<<(Debug& debug, const Context::Flag value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Context::Flag(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const Context::Flags value) {
@ -1069,9 +1071,11 @@ Debug& operator<<(Debug& debug, const Context::Flags value) {
#endif
Debug& operator<<(Debug& debug, const Context::DetectedDriver value) {
debug << "GL::Context::DetectedDriver" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Context::DetectedDriver::value: return debug << "GL::Context::DetectedDriver::" #value;
#define _c(value) case Context::DetectedDriver::value: return debug << "::" #value;
#ifndef MAGNUM_TARGET_WEBGL
_c(Amd)
#endif
@ -1094,7 +1098,7 @@ Debug& operator<<(Debug& debug, const Context::DetectedDriver value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Context::DetectedDriver(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const Context::DetectedDrivers value) {

36
src/Magnum/GL/DebugOutput.cpp
Unescape View File

@ -210,9 +210,11 @@ void DebugOutput::callbackImplementationKhrES(const Callback callback, const voi
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const DebugOutput::Source value) {
debug << "GL::DebugOutput::Source" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DebugOutput::Source::value: return debug << "GL::DebugOutput::Source::" #value;
#define _c(value) case DebugOutput::Source::value: return debug << "::" #value;
_c(Api)
_c(WindowSystem)
_c(ShaderCompiler)
@ -223,13 +225,15 @@ Debug& operator<<(Debug& debug, const DebugOutput::Source value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::DebugOutput::Source(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const DebugOutput::Type value) {
debug << "GL::DebugOutput::Type" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DebugOutput::Type::value: return debug << "GL::DebugOutput::Type::" #value;
#define _c(value) case DebugOutput::Type::value: return debug << "::" #value;
_c(Error)
_c(DeprecatedBehavior)
_c(UndefinedBehavior)
@ -243,12 +247,14 @@ Debug& operator<<(Debug& debug, const DebugOutput::Type value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::DebugOutput::Type(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const DebugOutput::Severity value) {
debug << "GL::DebugOutput::Severity" << Debug::nospace;
switch(value) {
#define _c(value) case DebugOutput::Severity::value: return debug << "GL::DebugOutput::Severity::" #value;
#define _c(value) case DebugOutput::Severity::value: return debug << "::" #value;
_c(High)
_c(Medium)
_c(Low)
@ -256,7 +262,7 @@ Debug& operator<<(Debug& debug, const DebugOutput::Severity value) {
#undef _c
}
return debug << "GL::DebugOutput::Severity(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif
@ -290,21 +296,25 @@ void DebugMessage::insertImplementationGremedy(Source, Type, UnsignedInt, DebugO
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const DebugMessage::Source value) {
debug << "GL::DebugMessage::Source" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DebugMessage::Source::value: return debug << "GL::DebugMessage::Source::" #value;
#define _c(value) case DebugMessage::Source::value: return debug << "::" #value;
_c(ThirdParty)
_c(Application)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "GL::DebugMessage::Source(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const DebugMessage::Type value) {
debug << "GL::DebugMessage::Type" << Debug::nospace;
switch(value) {
#define _c(value) case DebugMessage::Type::value: return debug << "GL::DebugMessage::Type::" #value;
#define _c(value) case DebugMessage::Type::value: return debug << "::" #value;
_c(Error)
_c(DeprecatedBehavior)
_c(UndefinedBehavior)
@ -315,7 +325,7 @@ Debug& operator<<(Debug& debug, const DebugMessage::Type value) {
#undef _c
}
return debug << "GL::DebugMessage::Type(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif
@ -386,16 +396,18 @@ void DebugGroup::popImplementationExt() {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const DebugGroup::Source value) {
debug << "GL::DebugGroup::Source" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DebugGroup::Source::value: return debug << "GL::DebugGroup::Source::" #value;
#define _c(value) case DebugGroup::Source::value: return debug << "::" #value;
_c(ThirdParty)
_c(Application)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "GL::DebugGroup::Source(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif

6
src/Magnum/GL/DefaultFramebuffer.cpp
Unescape View File

@ -125,9 +125,11 @@ void DefaultFramebuffer::initializeContextBasedFunctionality(Context& context) {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const DefaultFramebuffer::Status value) {
debug << "GL::DefaultFramebuffer::Status" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case DefaultFramebuffer::Status::value: return debug << "GL::DefaultFramebuffer::Status::" #value;
#define _c(value) case DefaultFramebuffer::Status::value: return debug << "::" #value;
_c(Complete)
#ifndef MAGNUM_TARGET_WEBGL
_c(Undefined)
@ -136,7 +138,7 @@ Debug& operator<<(Debug& debug, const DefaultFramebuffer::Status value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::DefaultFramebuffer::Status(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif

6
src/Magnum/GL/Framebuffer.cpp
Unescape View File

@ -397,9 +397,11 @@ void Framebuffer::textureLayerImplementationDSA(const BufferAttachment attachmen
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const Framebuffer::Status value) {
debug << "GL::Framebuffer::Status" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Framebuffer::Status::value: return debug << "GL::Framebuffer::Status::" #value;
#define _c(value) case Framebuffer::Status::value: return debug << "::" #value;
_c(Complete)
_c(IncompleteAttachment)
_c(IncompleteMissingAttachment)
@ -418,7 +420,7 @@ Debug& operator<<(Debug& debug, const Framebuffer::Status value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Framebuffer::Status(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif

16
src/Magnum/GL/Mesh.cpp
Unescape View File

@ -78,10 +78,12 @@ MeshIndexType meshIndexType(const Magnum::MeshIndexType type) {
}
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, MeshPrimitive value) {
Debug& operator<<(Debug& debug, const MeshPrimitive value) {
debug << "GL::MeshPrimitive" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case MeshPrimitive::value: return debug << "GL::MeshPrimitive::" #value;
#define _c(value) case MeshPrimitive::value: return debug << "::" #value;
_c(Points)
_c(Lines)
_c(LineLoop)
@ -102,13 +104,15 @@ Debug& operator<<(Debug& debug, MeshPrimitive value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::MeshPrimitive(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, MeshIndexType value) {
Debug& operator<<(Debug& debug, const MeshIndexType value) {
debug << "GL::MeshIndexType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case MeshIndexType::value: return debug << "GL::MeshIndexType::" #value;
#define _c(value) case MeshIndexType::value: return debug << "::" #value;
_c(UnsignedByte)
_c(UnsignedShort)
_c(UnsignedInt)
@ -116,7 +120,7 @@ Debug& operator<<(Debug& debug, MeshIndexType value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::MeshIndexType(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif

18
src/Magnum/GL/PixelFormat.cpp
Unescape View File

@ -263,13 +263,15 @@ UnsignedInt pixelSize(const PixelFormat format, const PixelType type) {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const PixelFormat value) {
debug << "GL::PixelFormat" << Debug::nospace;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case PixelFormat::value: return debug << "GL::PixelFormat::" #value;
#define _c(value) case PixelFormat::value: return debug << "::" #value;
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
_c(Red)
#endif
@ -324,17 +326,19 @@ Debug& operator<<(Debug& debug, const PixelFormat value) {
#pragma GCC diagnostic pop
#endif
return debug << "GL::PixelFormat(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const PixelType value) {
debug << "GL::PixelType" << Debug::nospace;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case PixelType::value: return debug << "GL::PixelType::" #value;
#define _c(value) case PixelType::value: return debug << "::" #value;
_c(UnsignedByte)
#ifndef MAGNUM_TARGET_GLES2
_c(Byte)
@ -388,7 +392,7 @@ Debug& operator<<(Debug& debug, const PixelType value) {
#pragma GCC diagnostic pop
#endif
return debug << "GL::PixelType(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
namespace {
@ -452,13 +456,15 @@ TextureFormat textureFormat(const Magnum::CompressedPixelFormat format) {
}
Debug& operator<<(Debug& debug, const CompressedPixelFormat value) {
debug << "GL::CompressedPixelFormat" << Debug::nospace;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case CompressedPixelFormat::value: return debug << "GL::CompressedPixelFormat::" #value;
#define _c(value) case CompressedPixelFormat::value: return debug << "::" #value;
#ifndef MAGNUM_TARGET_GLES
_c(Red)
_c(RG)
@ -570,7 +576,7 @@ Debug& operator<<(Debug& debug, const CompressedPixelFormat value) {
#pragma GCC diagnostic pop
#endif
return debug << "GL::CompressedPixelFormat(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif

18
src/Magnum/GL/Renderer.cpp
Unescape View File

@ -274,9 +274,11 @@ Renderer::GraphicsResetStatus Renderer::graphicsResetStatusImplementationRobustn
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const Renderer::Error value) {
debug << "GL::Renderer::Error" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Renderer::Error::value: return debug << "GL::Renderer::Error::" #value;
#define _c(value) case Renderer::Error::value: return debug << "::" #value;
_c(NoError)
_c(InvalidEnum)
_c(InvalidValue)
@ -291,27 +293,31 @@ Debug& operator<<(Debug& debug, const Renderer::Error value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Renderer::Error(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#ifndef MAGNUM_TARGET_WEBGL
Debug& operator<<(Debug& debug, const Renderer::ResetNotificationStrategy value) {
debug << "GL::Renderer::ResetNotificationStrategy" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Renderer::ResetNotificationStrategy::value: return debug << "GL::Renderer::ResetNotificationStrategy::" #value;
#define _c(value) case Renderer::ResetNotificationStrategy::value: return debug << "::" #value;
_c(NoResetNotification)
_c(LoseContextOnReset)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "GL::Renderer::ResetNotificationStrategy(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const Renderer::GraphicsResetStatus value) {
debug << "GL::Renderer::GraphicsResetStatus" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Renderer::GraphicsResetStatus::value: return debug << "GL::Renderer::GraphicsResetStatus::" #value;
#define _c(value) case Renderer::GraphicsResetStatus::value: return debug << "::" #value;
_c(NoError)
_c(GuiltyContextReset)
_c(InnocentContextReset)
@ -320,7 +326,7 @@ Debug& operator<<(Debug& debug, const Renderer::GraphicsResetStatus value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Renderer::GraphicsResetStatus(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif
#endif

36
src/Magnum/GL/Sampler.cpp
Unescape View File

@ -131,22 +131,26 @@ Float Sampler::maxMaxAnisotropy() {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const SamplerFilter value) {
debug << "GL::SamplerFilter" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerFilter::value: return debug << "GL::SamplerFilter::" #value;
#define _c(value) case SamplerFilter::value: return debug << "::" #value;
_c(Nearest)
_c(Linear)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "GL::SamplerFilter(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const SamplerMipmap value) {
debug << "GL::SamplerMipmap" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerMipmap::value: return debug << "GL::SamplerMipmap::" #value;
#define _c(value) case SamplerMipmap::value: return debug << "::" #value;
_c(Base)
_c(Nearest)
_c(Linear)
@ -154,13 +158,15 @@ Debug& operator<<(Debug& debug, const SamplerMipmap value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::SamplerMipmap(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const SamplerWrapping value) {
debug << "GL::SamplerWrapping" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerWrapping::value: return debug << "GL::SamplerWrapping::" #value;
#define _c(value) case SamplerWrapping::value: return debug << "::" #value;
_c(Repeat)
_c(MirroredRepeat)
_c(ClampToEdge)
@ -174,27 +180,31 @@ Debug& operator<<(Debug& debug, const SamplerWrapping value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::SamplerWrapping(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLint(value)) << Debug::nospace << ")";
}
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Debug& operator<<(Debug& debug, const SamplerCompareMode value) {
debug << "GL::SamplerCompareMode" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerCompareMode::value: return debug << "GL::SamplerCompareMode::" #value;
#define _c(value) case SamplerCompareMode::value: return debug << "::" #value;
_c(None)
_c(CompareRefToTexture)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "GL::SamplerCompareMode(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const SamplerCompareFunction value) {
debug << "GL::SamplerCompareFunction" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerCompareFunction::value: return debug << "GL::SamplerCompareFunction::" #value;
#define _c(value) case SamplerCompareFunction::value: return debug << "::" #value;
_c(Never)
_c(Always)
_c(Less)
@ -207,22 +217,24 @@ Debug& operator<<(Debug& debug, const SamplerCompareFunction value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::SamplerCompareFunction(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif
#ifndef MAGNUM_TARGET_GLES
Debug& operator<<(Debug& debug, const SamplerDepthStencilMode value) {
debug << "GL::SamplerDepthStencilMode" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerDepthStencilMode::value: return debug << "GL::SamplerDepthStencilMode::" #value;
#define _c(value) case SamplerDepthStencilMode::value: return debug << "::" #value;
_c(DepthComponent)
_c(StencilIndex)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "GL::SamplerDepthStencilMode(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif
#endif

6
src/Magnum/GL/Shader.cpp
Unescape View File

@ -817,9 +817,11 @@ bool Shader::compile(std::initializer_list<Containers::Reference<Shader>> shader
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const Shader::Type value) {
debug << "GL::Shader::Type" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case Shader::Type::value: return debug << "GL::Shader::Type::" #value;
#define _c(value) case Shader::Type::value: return debug << "::" #value;
_c(Vertex)
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
_c(TessellationControl)
@ -832,7 +834,7 @@ Debug& operator<<(Debug& debug, const Shader::Type value) {
/* LCOV_EXCL_STOP */
}
return debug << "GL::Shader::Type(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif

6
src/Magnum/GL/TextureFormat.cpp
Unescape View File

@ -40,13 +40,15 @@ namespace Magnum { namespace GL {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const TextureFormat value) {
debug << "GL::TextureFormat" << Debug::nospace;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case TextureFormat::value: return debug << "GL::TextureFormat::" #value;
#define _c(value) case TextureFormat::value: return debug << "::" #value;
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
_c(Red)
_c(R8)
@ -299,7 +301,7 @@ Debug& operator<<(Debug& debug, const TextureFormat value) {
#pragma GCC diagnostic pop
#endif
return debug << "GL::TextureFormat(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
}
#endif

2
src/Magnum/GL/Version.cpp
Unescape View File

@ -30,7 +30,7 @@
namespace Magnum { namespace GL {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, Version value) {
Debug& operator<<(Debug& debug, const Version value) {
switch(value) {
/* LCOV_EXCL_START */
#define _c(value, string) case Version::value: return debug << (string);

6
src/Magnum/Resource.cpp
Unescape View File

@ -29,9 +29,11 @@ namespace Magnum {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const ResourceState value) {
debug << "ResourceState" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case ResourceState::value: return debug << "ResourceState::" #value;
#define _c(value) case ResourceState::value: return debug << "::" #value;
_c(NotLoaded)
_c(NotLoadedFallback)
_c(Loading)
@ -44,7 +46,7 @@ Debug& operator<<(Debug& debug, const ResourceState value) {
/* LCOV_EXCL_STOP */
}
return debug << "ResourceState(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
#endif

18
src/Magnum/Sampler.cpp
Unescape View File

@ -31,22 +31,26 @@ namespace Magnum {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const SamplerFilter value) {
debug << "SamplerFilter" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerFilter::value: return debug << "SamplerFilter::" #value;
#define _c(value) case SamplerFilter::value: return debug << "::" #value;
_c(Nearest)
_c(Linear)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "SamplerFilter(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const SamplerMipmap value) {
debug << "SamplerMipmap" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerMipmap::value: return debug << "SamplerMipmap::" #value;
#define _c(value) case SamplerMipmap::value: return debug << "::" #value;
_c(Base)
_c(Nearest)
_c(Linear)
@ -54,13 +58,15 @@ Debug& operator<<(Debug& debug, const SamplerMipmap value) {
/* LCOV_EXCL_STOP */
}
return debug << "SamplerMipmap(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const SamplerWrapping value) {
debug << "SamplerWrapping" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case SamplerWrapping::value: return debug << "SamplerWrapping::" #value;
#define _c(value) case SamplerWrapping::value: return debug << "::" #value;
_c(Repeat)
_c(MirroredRepeat)
_c(ClampToEdge)
@ -70,7 +76,7 @@ Debug& operator<<(Debug& debug, const SamplerWrapping value) {
/* LCOV_EXCL_STOP */
}
return debug << "SamplerWrapping(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")";
}
#endif

8
src/Magnum/SceneGraph/Animable.cpp
Unescape View File

@ -29,10 +29,12 @@
namespace Magnum { namespace SceneGraph {
Debug& operator<<(Debug& debug, AnimationState value) {
Debug& operator<<(Debug& debug, const AnimationState value) {
debug << "SceneGraph::AnimationState" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case AnimationState::value: return debug << "SceneGraph::AnimationState::" #value;
#define _c(value) case AnimationState::value: return debug << "::" #value;
_c(Stopped)
_c(Paused)
_c(Running)
@ -40,7 +42,7 @@ Debug& operator<<(Debug& debug, AnimationState value) {
/* LCOV_EXCL_STOP */
}
return debug << "SceneGraph::AnimationState(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
}}

6
src/Magnum/Shaders/Flat.cpp
Unescape View File

@ -173,9 +173,11 @@ template class Flat<3>;
namespace Implementation {
Debug& operator<<(Debug& debug, const FlatFlag value) {
debug << "Shaders::Flat::Flag" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case FlatFlag::v: return debug << "Shaders::Flat::Flag::" #v;
#define _c(v) case FlatFlag::v: return debug << "::" #v;
_c(Textured)
_c(AlphaMask)
_c(VertexColor)
@ -186,7 +188,7 @@ Debug& operator<<(Debug& debug, const FlatFlag value) {
/* LCOV_EXCL_STOP */
}
return debug << "Shaders::Flat::Flag(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const FlatFlags value) {

6
src/Magnum/Shaders/MeshVisualizer.cpp
Unescape View File

@ -200,16 +200,18 @@ MeshVisualizer& MeshVisualizer::setSmoothness(const Float smoothness) {
}
Debug& operator<<(Debug& debug, const MeshVisualizer::Flag value) {
debug << "Shaders::MeshVisualizer::Flag" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case MeshVisualizer::Flag::v: return debug << "Shaders::MeshVisualizer::Flag::" #v;
#define _c(v) case MeshVisualizer::Flag::v: return debug << "::" #v;
_c(NoGeometryShader)
_c(Wireframe)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "Shaders::MeshVisualizer::Flag(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const MeshVisualizer::Flags value) {

6
src/Magnum/Shaders/Phong.cpp
Unescape View File

@ -327,9 +327,11 @@ Phong& Phong::setLightColor(UnsignedInt id, const Magnum::Color4& color) {
}
Debug& operator<<(Debug& debug, const Phong::Flag value) {
debug << "Shaders::Phong::Flag" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case Phong::Flag::v: return debug << "Shaders::Phong::Flag::" #v;
#define _c(v) case Phong::Flag::v: return debug << "::" #v;
_c(AmbientTexture)
_c(DiffuseTexture)
_c(SpecularTexture)
@ -343,7 +345,7 @@ Debug& operator<<(Debug& debug, const Phong::Flag value) {
/* LCOV_EXCL_STOP */
}
return debug << "Shaders::Phong::Flag(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const Phong::Flags value) {

6
src/Magnum/Text/AbstractFont.cpp
Unescape View File

@ -276,9 +276,11 @@ Containers::Pointer<AbstractLayouter> AbstractFont::layout(const AbstractGlyphCa
}
Debug& operator<<(Debug& debug, const AbstractFont::Feature value) {
debug << "Text::AbstractFont::Feature" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case AbstractFont::Feature::v: return debug << "Text::AbstractFont::Feature::" #v;
#define _c(v) case AbstractFont::Feature::v: return debug << "::" #v;
_c(OpenData)
_c(FileCallback)
_c(PreparedGlyphCache)
@ -286,7 +288,7 @@ Debug& operator<<(Debug& debug, const AbstractFont::Feature value) {
/* LCOV_EXCL_STOP */
}
return debug << "Text::AbstractFont::Feature(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const AbstractFont::Features value) {

6
src/Magnum/Trade/AbstractImageConverter.cpp
Unescape View File

@ -187,9 +187,11 @@ bool AbstractImageConverter::exportToFile(const ImageData2D& image, const std::s
}
Debug& operator<<(Debug& debug, const AbstractImageConverter::Feature value) {
debug << "Trade::AbstractImageConverter::Feature" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case AbstractImageConverter::Feature::v: return debug << "Trade::AbstractImageConverter::Feature::" #v;
#define _c(v) case AbstractImageConverter::Feature::v: return debug << "::" #v;
_c(ConvertImage)
_c(ConvertCompressedImage)
_c(ConvertFile)
@ -200,7 +202,7 @@ Debug& operator<<(Debug& debug, const AbstractImageConverter::Feature value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::AbstractImageConverter::Feature(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const AbstractImageConverter::Features value) {

6
src/Magnum/Trade/AbstractImporter.cpp
Unescape View File

@ -640,9 +640,11 @@ const void* AbstractImporter::importerState() const {
const void* AbstractImporter::doImporterState() const { return nullptr; }
Debug& operator<<(Debug& debug, const AbstractImporter::Feature value) {
debug << "Trade::AbstractImporter::Feature" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case AbstractImporter::Feature::v: return debug << "Trade::AbstractImporter::Feature::" #v;
#define _c(v) case AbstractImporter::Feature::v: return debug << "::" #v;
_c(OpenData)
_c(OpenState)
_c(FileCallback)
@ -650,7 +652,7 @@ Debug& operator<<(Debug& debug, const AbstractImporter::Feature value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::AbstractImporter::Feature(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const AbstractImporter::Features value) {

18
src/Magnum/Trade/AbstractMaterialData.cpp
Unescape View File

@ -39,27 +39,31 @@ AbstractMaterialData::AbstractMaterialData(const MaterialType type, const Flags
AbstractMaterialData::~AbstractMaterialData() = default;
Debug& operator<<(Debug& debug, const MaterialType value) {
debug << "Trade::MaterialType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case MaterialType::value: return debug << "Trade::MaterialType::" #value;
#define _c(value) case MaterialType::value: return debug << "::" #value;
_c(Phong)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "Trade::MaterialType(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const AbstractMaterialData::Flag value) {
debug << "Trade::AbstractMaterialData::Flag" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case AbstractMaterialData::Flag::value: return debug << "Trade::AbstractMaterialData::Flag::" #value;
#define _c(value) case AbstractMaterialData::Flag::value: return debug << "::" #value;
_c(DoubleSided)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "Trade::AbstractMaterialData::Flag(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const AbstractMaterialData::Flags value) {
@ -69,9 +73,11 @@ Debug& operator<<(Debug& debug, const AbstractMaterialData::Flags value) {
}
Debug& operator<<(Debug& debug, const MaterialAlphaMode value) {
debug << "Trade::MaterialAlphaMode" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case MaterialAlphaMode::value: return debug << "Trade::MaterialAlphaMode::" #value;
#define _c(value) case MaterialAlphaMode::value: return debug << "::" #value;
_c(Opaque)
_c(Mask)
_c(Blend)
@ -79,7 +85,7 @@ Debug& operator<<(Debug& debug, const MaterialAlphaMode value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::MaterialAlphaMode(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
}}

6
src/Magnum/Trade/AnimationData.cpp
Unescape View File

@ -106,9 +106,11 @@ template MAGNUM_TRADE_EXPORT auto animationInterpolatorFor<CubicHermiteComplex,
template MAGNUM_TRADE_EXPORT auto animationInterpolatorFor<CubicHermiteQuaternion, Quaternion>(Animation::Interpolation) -> Quaternion(*)(const CubicHermiteQuaternion&, const CubicHermiteQuaternion&, Float);
Debug& operator<<(Debug& debug, const AnimationTrackType value) {
debug << "Trade::AnimationTrackType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case AnimationTrackType::value: return debug << "Trade::AnimationTrackType::" #value;
#define _c(value) case AnimationTrackType::value: return debug << "::" #value;
_c(Bool)
_c(Float)
_c(UnsignedInt)
@ -137,7 +139,7 @@ Debug& operator<<(Debug& debug, const AnimationTrackType value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::AnimationTrackType(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const AnimationTrackTargetType value) {

6
src/Magnum/Trade/CameraData.cpp
Unescape View File

@ -47,9 +47,11 @@ Rad CameraData::fov() const {
}
Debug& operator<<(Debug& debug, const CameraType value) {
debug << "Trade::CameraType" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case CameraType::value: return debug << "Trade::CameraType::" #value;
#define _c(value) case CameraType::value: return debug << "::" #value;
_c(Orthographic2D)
_c(Orthographic3D)
_c(Perspective3D)
@ -57,7 +59,7 @@ Debug& operator<<(Debug& debug, const CameraType value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::CameraType(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
}}

6
src/Magnum/Trade/LightData.cpp
Unescape View File

@ -29,9 +29,11 @@ namespace Magnum { namespace Trade {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const LightData::Type value) {
debug << "Trade::LightData::Type" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case LightData::Type::value: return debug << "Trade::LightData::Type::" #value;
#define _c(value) case LightData::Type::value: return debug << "::" #value;
_c(Infinite)
_c(Point)
_c(Spot)
@ -39,7 +41,7 @@ Debug& operator<<(Debug& debug, const LightData::Type value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::LightData::Type(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
#endif

18
src/Magnum/Trade/ObjectData2D.cpp
Unescape View File

@ -78,10 +78,12 @@ Matrix3 ObjectData2D::transformation() const {
}
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, ObjectInstanceType2D value) {
Debug& operator<<(Debug& debug, const ObjectInstanceType2D value) {
debug << "Trade::ObjectInstanceType2D" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case ObjectInstanceType2D::value: return debug << "Trade::ObjectInstanceType2D::" #value;
#define _c(value) case ObjectInstanceType2D::value: return debug << "::" #value;
_c(Camera)
_c(Mesh)
_c(Empty)
@ -89,22 +91,24 @@ Debug& operator<<(Debug& debug, ObjectInstanceType2D value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::ObjectInstanceType2D(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, ObjectFlag2D value) {
Debug& operator<<(Debug& debug, const ObjectFlag2D value) {
debug << "Trade::ObjectFlag2D" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case ObjectFlag2D::value: return debug << "Trade::ObjectFlag2D::" #value;
#define _c(value) case ObjectFlag2D::value: return debug << "::" #value;
_c(HasTranslationRotationScaling)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "Trade::ObjectFlag2D(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, ObjectFlags2D value) {
Debug& operator<<(Debug& debug, const ObjectFlags2D value) {
return enumSetDebugOutput(debug, value, "Trade::ObjectFlags2D{}", {
ObjectFlag2D::HasTranslationRotationScaling});
}

18
src/Magnum/Trade/ObjectData3D.cpp
Unescape View File

@ -78,10 +78,12 @@ Matrix4 ObjectData3D::transformation() const {
}
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, ObjectInstanceType3D value) {
Debug& operator<<(Debug& debug, const ObjectInstanceType3D value) {
debug << "Trade::ObjectInstanceType3D" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case ObjectInstanceType3D::value: return debug << "Trade::ObjectInstanceType3D::" #value;
#define _c(value) case ObjectInstanceType3D::value: return debug << "::" #value;
_c(Camera)
_c(Light)
_c(Mesh)
@ -90,22 +92,24 @@ Debug& operator<<(Debug& debug, ObjectInstanceType3D value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::ObjectInstanceType3D(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, ObjectFlag3D value) {
Debug& operator<<(Debug& debug, const ObjectFlag3D value) {
debug << "Trade::ObjectFlag3D" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case ObjectFlag3D::value: return debug << "Trade::ObjectFlag3D::" #value;
#define _c(value) case ObjectFlag3D::value: return debug << "::" #value;
_c(HasTranslationRotationScaling)
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "Trade::ObjectFlag3D(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, ObjectFlags3D value) {
Debug& operator<<(Debug& debug, const ObjectFlags3D value) {
return enumSetDebugOutput(debug, value, "Trade::ObjectFlags3D{}", {
ObjectFlag3D::HasTranslationRotationScaling});
}

6
src/Magnum/Trade/PhongMaterialData.cpp
Unescape View File

@ -120,9 +120,11 @@ UnsignedInt& PhongMaterialData::specularTexture() {
}
Debug& operator<<(Debug& debug, const PhongMaterialData::Flag value) {
debug << "Trade::PhongMaterialData::Flag" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(v) case PhongMaterialData::Flag::v: return debug << "Trade::PhongMaterialData::Flag::" #v;
#define _c(v) case PhongMaterialData::Flag::v: return debug << "::" #v;
_c(DoubleSided)
_c(AmbientTexture)
_c(DiffuseTexture)
@ -131,7 +133,7 @@ Debug& operator<<(Debug& debug, const PhongMaterialData::Flag value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::PhongMaterialData::Flag(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Debug& operator<<(Debug& debug, const PhongMaterialData::Flags value) {

6
src/Magnum/Trade/TextureData.cpp
Unescape View File

@ -29,9 +29,11 @@ namespace Magnum { namespace Trade {
#ifndef DOXYGEN_GENERATING_OUTPUT
Debug& operator<<(Debug& debug, const TextureData::Type value) {
debug << "Trade::TextureData::Type" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case TextureData::Type::value: return debug << "Trade::TextureData::Type::" #value;
#define _c(value) case TextureData::Type::value: return debug << "::" #value;
_c(Texture1D)
_c(Texture2D)
_c(Texture3D)
@ -40,7 +42,7 @@ Debug& operator<<(Debug& debug, const TextureData::Type value) {
/* LCOV_EXCL_STOP */
}
return debug << "Trade::TextureData::Type(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
#endif

6
src/MagnumPlugins/WavAudioImporter/WavHeader.cpp
Unescape View File

@ -34,9 +34,11 @@ static_assert(sizeof(WavHeaderChunk) == 12, "WavHeaderChunk size is not 12 bytes
static_assert(sizeof(WavFormatChunk) == 24, "WavFormatChunk size is not 18 bytes");
Debug& operator<<(Debug& debug, const WavAudioFormat value) {
debug << "Audio::WavAudioFormat" << Debug::nospace;
switch(value) {
/* LCOV_EXCL_START */
#define _c(value) case WavAudioFormat::value: return debug << "Audio::WavAudioFormat::" #value;
#define _c(value) case WavAudioFormat::value: return debug << "::" #value;
_c(Unknown)
_c(Pcm)
_c(AdPcm)
@ -48,7 +50,7 @@ Debug& operator<<(Debug& debug, const WavAudioFormat value) {
/* LCOV_EXCL_STOP */
}
return debug << "Audio::WavAudioFormat(" << Debug::nospace << reinterpret_cast<void*>(UnsignedShort(value)) << Debug::nospace << ")";
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedShort(value)) << Debug::nospace << ")";
}
}}}

Write Preview
Loading…
Cancel
Save