From 4ee6119ace9ab71dc2d02ce11adb7c686d6be1f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 14 Dec 2022 16:07:23 +0100 Subject: [PATCH] Shaders: add all values to MeshVisualizerGL*D::Flags debug printer. Forgot about these for some reason. --- src/Magnum/Shaders/MeshVisualizerGL.cpp | 10 ++++++++-- .../Shaders/Test/MeshVisualizerGL_Test.cpp | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Shaders/MeshVisualizerGL.cpp b/src/Magnum/Shaders/MeshVisualizerGL.cpp index 2cd242ba7..a9288357b 100644 --- a/src/Magnum/Shaders/MeshVisualizerGL.cpp +++ b/src/Magnum/Shaders/MeshVisualizerGL.cpp @@ -1333,6 +1333,8 @@ Debug& operator<<(Debug& debug, const MeshVisualizerGL2D::Flags value) { #endif MeshVisualizerGL2D::Flag::InstancedTransformation, #ifndef MAGNUM_TARGET_GLES2 + MeshVisualizerGL2D::Flag::InstancedTextureOffset, /* Superset of TextureTransformation */ + MeshVisualizerGL2D::Flag::TextureTransformation, MeshVisualizerGL2D::Flag::VertexId, MeshVisualizerGL2D::Flag::PrimitiveIdFromVertexId, /* Superset of PrimitiveId */ #ifndef MAGNUM_TARGET_WEBGL @@ -1340,7 +1342,8 @@ Debug& operator<<(Debug& debug, const MeshVisualizerGL2D::Flags value) { #endif #ifndef MAGNUM_TARGET_GLES2 MeshVisualizerGL2D::Flag::MultiDraw, /* Superset of UniformBuffers */ - MeshVisualizerGL2D::Flag::UniformBuffers + MeshVisualizerGL2D::Flag::UniformBuffers, + MeshVisualizerGL2D::Flag::TextureArrays, #endif #endif }); @@ -1369,6 +1372,8 @@ Debug& operator<<(Debug& debug, const MeshVisualizerGL3D::Flags value) { #endif MeshVisualizerGL3D::Flag::InstancedTransformation, #ifndef MAGNUM_TARGET_GLES2 + MeshVisualizerGL3D::Flag::InstancedTextureOffset, /* Superset of TextureTransformation */ + MeshVisualizerGL3D::Flag::TextureTransformation, MeshVisualizerGL3D::Flag::VertexId, MeshVisualizerGL3D::Flag::PrimitiveIdFromVertexId, /* Superset of PrimitiveId */ #ifndef MAGNUM_TARGET_WEBGL @@ -1376,7 +1381,8 @@ Debug& operator<<(Debug& debug, const MeshVisualizerGL3D::Flags value) { #endif #ifndef MAGNUM_TARGET_GLES2 MeshVisualizerGL3D::Flag::MultiDraw, /* Superset of UniformBuffers */ - MeshVisualizerGL3D::Flag::UniformBuffers + MeshVisualizerGL3D::Flag::UniformBuffers, + MeshVisualizerGL3D::Flag::TextureArrays, #endif #endif }); diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGL_Test.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGL_Test.cpp index ed5d543a3..f3747dcd1 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGL_Test.cpp +++ b/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"); } + /* 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 */ { std::ostringstream out; @@ -193,6 +201,14 @@ void MeshVisualizerGL_Test::debugFlagsSupersets3D() { 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 */ { std::ostringstream out;