Browse Source

Shaders: add all values to MeshVisualizerGL*D::Flags debug printer.

Forgot about these for some reason.
pull/499/head
Vladimír Vondruš 3 years ago
parent
commit
4ee6119ace
  1. 10
      src/Magnum/Shaders/MeshVisualizerGL.cpp
  2. 16
      src/Magnum/Shaders/Test/MeshVisualizerGL_Test.cpp

10
src/Magnum/Shaders/MeshVisualizerGL.cpp

@ -1333,6 +1333,8 @@ Debug& operator<<(Debug& debug, const MeshVisualizerGL2D::Flags value) {
#endif #endif
MeshVisualizerGL2D::Flag::InstancedTransformation, MeshVisualizerGL2D::Flag::InstancedTransformation,
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
MeshVisualizerGL2D::Flag::InstancedTextureOffset, /* Superset of TextureTransformation */
MeshVisualizerGL2D::Flag::TextureTransformation,
MeshVisualizerGL2D::Flag::VertexId, MeshVisualizerGL2D::Flag::VertexId,
MeshVisualizerGL2D::Flag::PrimitiveIdFromVertexId, /* Superset of PrimitiveId */ MeshVisualizerGL2D::Flag::PrimitiveIdFromVertexId, /* Superset of PrimitiveId */
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
@ -1340,7 +1342,8 @@ Debug& operator<<(Debug& debug, const MeshVisualizerGL2D::Flags value) {
#endif #endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
MeshVisualizerGL2D::Flag::MultiDraw, /* Superset of UniformBuffers */ MeshVisualizerGL2D::Flag::MultiDraw, /* Superset of UniformBuffers */
MeshVisualizerGL2D::Flag::UniformBuffers MeshVisualizerGL2D::Flag::UniformBuffers,
MeshVisualizerGL2D::Flag::TextureArrays,
#endif #endif
#endif #endif
}); });
@ -1369,6 +1372,8 @@ Debug& operator<<(Debug& debug, const MeshVisualizerGL3D::Flags value) {
#endif #endif
MeshVisualizerGL3D::Flag::InstancedTransformation, MeshVisualizerGL3D::Flag::InstancedTransformation,
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
MeshVisualizerGL3D::Flag::InstancedTextureOffset, /* Superset of TextureTransformation */
MeshVisualizerGL3D::Flag::TextureTransformation,
MeshVisualizerGL3D::Flag::VertexId, MeshVisualizerGL3D::Flag::VertexId,
MeshVisualizerGL3D::Flag::PrimitiveIdFromVertexId, /* Superset of PrimitiveId */ MeshVisualizerGL3D::Flag::PrimitiveIdFromVertexId, /* Superset of PrimitiveId */
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
@ -1376,7 +1381,8 @@ Debug& operator<<(Debug& debug, const MeshVisualizerGL3D::Flags value) {
#endif #endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
MeshVisualizerGL3D::Flag::MultiDraw, /* Superset of UniformBuffers */ MeshVisualizerGL3D::Flag::MultiDraw, /* Superset of UniformBuffers */
MeshVisualizerGL3D::Flag::UniformBuffers MeshVisualizerGL3D::Flag::UniformBuffers,
MeshVisualizerGL3D::Flag::TextureArrays,
#endif #endif
#endif #endif
}); });

16
src/Magnum/Shaders/Test/MeshVisualizerGL_Test.cpp

@ -168,6 +168,14 @@ void MeshVisualizerGL_Test::debugFlagsSupersets2D() {
CORRADE_COMPARE(out.str(), "Shaders::MeshVisualizerGL2D::Flag::InstancedObjectId|Shaders::MeshVisualizerGL2D::Flag::ObjectIdTexture\n"); CORRADE_COMPARE(out.str(), "Shaders::MeshVisualizerGL2D::Flag::InstancedObjectId|Shaders::MeshVisualizerGL2D::Flag::ObjectIdTexture\n");
} }
/* InstancedTextureOffset is a superset of TextureTransformation so only
one should be printed */
{
std::ostringstream out;
Debug{&out} << (MeshVisualizerGL2D::Flag::InstancedTextureOffset|MeshVisualizerGL2D::Flag::TextureTransformation);
CORRADE_COMPARE(out.str(), "Shaders::MeshVisualizerGL2D::Flag::InstancedTextureOffset\n");
}
/* MultiDraw is a superset of UniformBuffers so only one should be printed */ /* MultiDraw is a superset of UniformBuffers so only one should be printed */
{ {
std::ostringstream out; std::ostringstream out;
@ -193,6 +201,14 @@ void MeshVisualizerGL_Test::debugFlagsSupersets3D() {
CORRADE_COMPARE(out.str(), "Shaders::MeshVisualizerGL3D::Flag::InstancedObjectId|Shaders::MeshVisualizerGL3D::Flag::ObjectIdTexture\n"); CORRADE_COMPARE(out.str(), "Shaders::MeshVisualizerGL3D::Flag::InstancedObjectId|Shaders::MeshVisualizerGL3D::Flag::ObjectIdTexture\n");
} }
/* InstancedTextureOffset is a superset of TextureTransformation so only
one should be printed */
{
std::ostringstream out;
Debug{&out} << (MeshVisualizerGL3D::Flag::InstancedTextureOffset|MeshVisualizerGL3D::Flag::TextureTransformation);
CORRADE_COMPARE(out.str(), "Shaders::MeshVisualizerGL3D::Flag::InstancedTextureOffset\n");
}
/* MultiDraw is a superset of UniformBuffers so only one should be printed */ /* MultiDraw is a superset of UniformBuffers so only one should be printed */
{ {
std::ostringstream out; std::ostringstream out;

Loading…
Cancel
Save