From 2fe98ab7917f6e8464e1f7e6dd41a894cb866bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 24 Jan 2022 18:54:50 +0100 Subject: [PATCH] Shaders: rename MeshVisualizer tests to make room for non-instanced IDs. --- src/Magnum/Shaders/Test/CMakeLists.txt | 16 +++---- .../Shaders/Test/MeshVisualizerGLTest.cpp | 40 +++++++++--------- ...D.tga => defaults-instancedobjectid2D.tga} | Bin ...D.tga => defaults-instancedobjectid3D.tga} | Bin ...objectid2D.tga => instancedobjectid2D.tga} | Bin ...objectid3D.tga => instancedobjectid3D.tga} | Bin ....tga => wireframe-instancedobjectid2D.tga} | Bin ....tga => wireframe-instancedobjectid3D.tga} | Bin ...> wireframe-nogeo-instancedobjectid2D.tga} | Bin ...> wireframe-nogeo-instancedobjectid3D.tga} | Bin 10 files changed, 28 insertions(+), 28 deletions(-) rename src/Magnum/Shaders/Test/MeshVisualizerTestFiles/{defaults-objectid2D.tga => defaults-instancedobjectid2D.tga} (100%) rename src/Magnum/Shaders/Test/MeshVisualizerTestFiles/{defaults-objectid3D.tga => defaults-instancedobjectid3D.tga} (100%) rename src/Magnum/Shaders/Test/MeshVisualizerTestFiles/{objectid2D.tga => instancedobjectid2D.tga} (100%) rename src/Magnum/Shaders/Test/MeshVisualizerTestFiles/{objectid3D.tga => instancedobjectid3D.tga} (100%) rename src/Magnum/Shaders/Test/MeshVisualizerTestFiles/{wireframe-objectid2D.tga => wireframe-instancedobjectid2D.tga} (100%) rename src/Magnum/Shaders/Test/MeshVisualizerTestFiles/{wireframe-objectid3D.tga => wireframe-instancedobjectid3D.tga} (100%) rename src/Magnum/Shaders/Test/MeshVisualizerTestFiles/{wireframe-nogeo-objectid2D.tga => wireframe-nogeo-instancedobjectid2D.tga} (100%) rename src/Magnum/Shaders/Test/MeshVisualizerTestFiles/{wireframe-nogeo-objectid3D.tga => wireframe-nogeo-instancedobjectid3D.tga} (100%) diff --git a/src/Magnum/Shaders/Test/CMakeLists.txt b/src/Magnum/Shaders/Test/CMakeLists.txt index 021acb252..90feea049 100644 --- a/src/Magnum/Shaders/Test/CMakeLists.txt +++ b/src/Magnum/Shaders/Test/CMakeLists.txt @@ -197,8 +197,8 @@ if(BUILD_GL_TESTS) MagnumOpenGLTester FILES MeshVisualizerTestFiles/bitangents-from-tangents.tga - MeshVisualizerTestFiles/defaults-objectid2D.tga - MeshVisualizerTestFiles/defaults-objectid3D.tga + MeshVisualizerTestFiles/defaults-instancedobjectid2D.tga + MeshVisualizerTestFiles/defaults-instancedobjectid3D.tga MeshVisualizerTestFiles/defaults-primitiveid2D.tga MeshVisualizerTestFiles/defaults-primitiveid3D.tga MeshVisualizerTestFiles/defaults-tbn.tga @@ -206,8 +206,8 @@ if(BUILD_GL_TESTS) MeshVisualizerTestFiles/defaults-vertexid3D.tga MeshVisualizerTestFiles/defaults-wireframe2D.tga MeshVisualizerTestFiles/defaults-wireframe3D.tga - MeshVisualizerTestFiles/objectid2D.tga - MeshVisualizerTestFiles/objectid3D.tga + MeshVisualizerTestFiles/instancedobjectid2D.tga + MeshVisualizerTestFiles/instancedobjectid3D.tga MeshVisualizerTestFiles/primitiveid-tn.tga MeshVisualizerTestFiles/primitiveid2D.tga MeshVisualizerTestFiles/primitiveid3D.tga @@ -217,10 +217,10 @@ if(BUILD_GL_TESTS) MeshVisualizerTestFiles/vertexid3D.tga MeshVisualizerTestFiles/wireframe-nogeo2D.tga MeshVisualizerTestFiles/wireframe-nogeo3D.tga - MeshVisualizerTestFiles/wireframe-objectid2D.tga - MeshVisualizerTestFiles/wireframe-objectid3D.tga - MeshVisualizerTestFiles/wireframe-nogeo-objectid2D.tga - MeshVisualizerTestFiles/wireframe-nogeo-objectid3D.tga + MeshVisualizerTestFiles/wireframe-instancedobjectid2D.tga + MeshVisualizerTestFiles/wireframe-instancedobjectid3D.tga + MeshVisualizerTestFiles/wireframe-nogeo-instancedobjectid2D.tga + MeshVisualizerTestFiles/wireframe-nogeo-instancedobjectid3D.tga MeshVisualizerTestFiles/wireframe-perspective.tga MeshVisualizerTestFiles/wireframe-primitiveid-tn.tga MeshVisualizerTestFiles/wireframe-tn-smooth.tga diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index 08a437725..3417e73d4 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -134,8 +134,8 @@ struct MeshVisualizerGLTest: GL::OpenGLTester { template void renderDefaultsWireframe3D(); #endif #ifndef MAGNUM_TARGET_GLES2 - template void renderDefaultsObjectId2D(); - template void renderDefaultsObjectId3D(); + template void renderDefaultsInstancedObjectId2D(); + template void renderDefaultsInstancedObjectId3D(); template void renderDefaultsVertexId2D(); template void renderDefaultsVertexId3D(); template void renderDefaultsPrimitiveId2D(); @@ -421,7 +421,7 @@ constexpr struct { const char* name; SamplerFilter filter; SamplerWrapping wrapping; -} ObjectIdDefaultsData[] { +} InstancedObjectIdDefaultsData[] { {"nearest, clamp", SamplerFilter::Nearest, SamplerWrapping::ClampToEdge}, {"nearest, repeat", SamplerFilter::Nearest, SamplerWrapping::Repeat}, {"linear, clamp", SamplerFilter::Linear, SamplerWrapping::ClampToEdge}, @@ -477,10 +477,10 @@ constexpr struct { const char* file2D; const char* file3D; } ObjectVertexPrimitiveIdData[] { - {"object ID", + {"instanced object ID", MeshVisualizerGL2D::Flag::InstancedObjectId, MeshVisualizerGL3D::Flag::InstancedObjectId, - "objectid2D.tga", "objectid3D.tga"}, + "instancedobjectid2D.tga", "instancedobjectid3D.tga"}, {"vertex ID", MeshVisualizerGL2D::Flag::VertexId, MeshVisualizerGL3D::Flag::VertexId, @@ -495,16 +495,16 @@ constexpr struct { MeshVisualizerGL2D::Flag::PrimitiveIdFromVertexId, MeshVisualizerGL3D::Flag::PrimitiveIdFromVertexId, "primitiveid2D.tga", "primitiveid3D.tga"}, - {"wireframe + object ID", + {"wireframe + instanced object ID", MeshVisualizerGL2D::Flag::InstancedObjectId|MeshVisualizerGL2D::Flag::Wireframe, MeshVisualizerGL3D::Flag::InstancedObjectId|MeshVisualizerGL3D::Flag::Wireframe, - "wireframe-objectid2D.tga", "wireframe-objectid3D.tga"}, - {"wireframe + object ID, no geometry shader", + "wireframe-instancedobjectid2D.tga", "wireframe-instancedobjectid3D.tga"}, + {"wireframe + instanced object ID, no geometry shader", MeshVisualizerGL2D::Flag::InstancedObjectId|MeshVisualizerGL2D::Flag::Wireframe| MeshVisualizerGL2D::Flag::NoGeometryShader, MeshVisualizerGL3D::Flag::InstancedObjectId|MeshVisualizerGL3D::Flag::Wireframe| MeshVisualizerGL3D::Flag::NoGeometryShader, - "wireframe-nogeo-objectid2D.tga", "wireframe-nogeo-objectid3D.tga"}, + "wireframe-nogeo-instancedobjectid2D.tga", "wireframe-nogeo-instancedobjectid3D.tga"}, {"wireframe + vertex ID", MeshVisualizerGL2D::Flag::VertexId|MeshVisualizerGL2D::Flag::Wireframe, MeshVisualizerGL3D::Flag::VertexId|MeshVisualizerGL3D::Flag::Wireframe, @@ -783,16 +783,16 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() { #ifndef MAGNUM_TARGET_GLES2 /* MSVC needs explicit type due to default template args */ addInstancedTests({ - &MeshVisualizerGLTest::renderDefaultsObjectId2D, + &MeshVisualizerGLTest::renderDefaultsInstancedObjectId2D, #ifndef MAGNUM_TARGET_GLES2 - &MeshVisualizerGLTest::renderDefaultsObjectId2D, + &MeshVisualizerGLTest::renderDefaultsInstancedObjectId2D, #endif - &MeshVisualizerGLTest::renderDefaultsObjectId3D, + &MeshVisualizerGLTest::renderDefaultsInstancedObjectId3D, #ifndef MAGNUM_TARGET_GLES2 - &MeshVisualizerGLTest::renderDefaultsObjectId3D, + &MeshVisualizerGLTest::renderDefaultsInstancedObjectId3D, #endif }, - Containers::arraySize(ObjectIdDefaultsData), + Containers::arraySize(InstancedObjectIdDefaultsData), &MeshVisualizerGLTest::renderSetup, &MeshVisualizerGLTest::renderTeardown); #endif @@ -1919,8 +1919,8 @@ template void MeshVisualizerGLTest::renderDefault #endif #ifndef MAGNUM_TARGET_GLES2 -template void MeshVisualizerGLTest::renderDefaultsObjectId2D() { - auto&& data = ObjectIdDefaultsData[testCaseInstanceId()]; +template void MeshVisualizerGLTest::renderDefaultsInstancedObjectId2D() { + auto&& data = InstancedObjectIdDefaultsData[testCaseInstanceId()]; setTestCaseDescription(data.name); if(flag == MeshVisualizerGL2D::Flag::UniformBuffers) { @@ -1990,13 +1990,13 @@ template void MeshVisualizerGLTest::renderDefault CORRADE_COMPARE_WITH( /* Dropping the alpha channel, as it's always 1.0 */ Containers::arrayCast(_framebuffer.read(_framebuffer.viewport(), {PixelFormat::RGBA8Unorm}).pixels()), - Utility::Directory::join(_testDir, "MeshVisualizerTestFiles/defaults-objectid2D.tga"), + Utility::Directory::join(_testDir, "MeshVisualizerTestFiles/defaults-instancedobjectid2D.tga"), /* SwiftShader has a few rounding errors on edges */ (DebugTools::CompareImageToFile{_manager, 150.67f, 0.45f})); } -template void MeshVisualizerGLTest::renderDefaultsObjectId3D() { - auto&& data = ObjectIdDefaultsData[testCaseInstanceId()]; +template void MeshVisualizerGLTest::renderDefaultsInstancedObjectId3D() { + auto&& data = InstancedObjectIdDefaultsData[testCaseInstanceId()]; setTestCaseDescription(data.name); if(flag == MeshVisualizerGL3D::Flag::UniformBuffers) { @@ -2070,7 +2070,7 @@ template void MeshVisualizerGLTest::renderDefault CORRADE_COMPARE_WITH( /* Dropping the alpha channel, as it's always 1.0 */ Containers::arrayCast(_framebuffer.read(_framebuffer.viewport(), {PixelFormat::RGBA8Unorm}).pixels()), - Utility::Directory::join(_testDir, "MeshVisualizerTestFiles/defaults-objectid3D.tga"), + Utility::Directory::join(_testDir, "MeshVisualizerTestFiles/defaults-instancedobjectid3D.tga"), /* SwiftShader has a few rounding errors on edges */ (DebugTools::CompareImageToFile{_manager, 150.67f, 0.165f})); } diff --git a/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/defaults-objectid2D.tga b/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/defaults-instancedobjectid2D.tga similarity index 100% rename from src/Magnum/Shaders/Test/MeshVisualizerTestFiles/defaults-objectid2D.tga rename to src/Magnum/Shaders/Test/MeshVisualizerTestFiles/defaults-instancedobjectid2D.tga diff --git a/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/defaults-objectid3D.tga b/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/defaults-instancedobjectid3D.tga similarity index 100% rename from src/Magnum/Shaders/Test/MeshVisualizerTestFiles/defaults-objectid3D.tga rename to src/Magnum/Shaders/Test/MeshVisualizerTestFiles/defaults-instancedobjectid3D.tga diff --git a/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/objectid2D.tga b/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/instancedobjectid2D.tga similarity index 100% rename from src/Magnum/Shaders/Test/MeshVisualizerTestFiles/objectid2D.tga rename to src/Magnum/Shaders/Test/MeshVisualizerTestFiles/instancedobjectid2D.tga diff --git a/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/objectid3D.tga b/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/instancedobjectid3D.tga similarity index 100% rename from src/Magnum/Shaders/Test/MeshVisualizerTestFiles/objectid3D.tga rename to src/Magnum/Shaders/Test/MeshVisualizerTestFiles/instancedobjectid3D.tga diff --git a/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-objectid2D.tga b/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-instancedobjectid2D.tga similarity index 100% rename from src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-objectid2D.tga rename to src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-instancedobjectid2D.tga diff --git a/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-objectid3D.tga b/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-instancedobjectid3D.tga similarity index 100% rename from src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-objectid3D.tga rename to src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-instancedobjectid3D.tga diff --git a/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-nogeo-objectid2D.tga b/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-nogeo-instancedobjectid2D.tga similarity index 100% rename from src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-nogeo-objectid2D.tga rename to src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-nogeo-instancedobjectid2D.tga diff --git a/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-nogeo-objectid3D.tga b/src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-nogeo-instancedobjectid3D.tga similarity index 100% rename from src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-nogeo-objectid3D.tga rename to src/Magnum/Shaders/Test/MeshVisualizerTestFiles/wireframe-nogeo-instancedobjectid3D.tga