From f285081da77ae5d4f071a8ad3848dbf3d9e01b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 14 Dec 2022 17:57:04 +0100 Subject: [PATCH] Shaders: name MeshVisualizer render test instance data consistently. --- .../Shaders/Test/MeshVisualizerGLTest.cpp | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index c3f9ba2e9..dbce8835c 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -589,7 +589,7 @@ constexpr struct { const char* name; SamplerFilter filter; SamplerWrapping wrapping; -} InstancedObjectIdDefaultsData[] { +} RenderInstancedObjectIdDefaultsData[] { {"nearest, clamp", SamplerFilter::Nearest, SamplerWrapping::ClampToEdge}, {"nearest, repeat", SamplerFilter::Nearest, SamplerWrapping::Repeat}, {"linear, clamp", SamplerFilter::Linear, SamplerWrapping::ClampToEdge}, @@ -603,7 +603,7 @@ constexpr struct { Float width, smoothness; const char* file; const char* fileXfail; -} WireframeData2D[] { +} RenderWireframeData2D[] { #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) {"", MeshVisualizerGL2D::Flags{}, 1.0f, 2.0f, "wireframe2D.tga", nullptr}, @@ -622,7 +622,7 @@ constexpr struct { Float width, smoothness; const char* file; const char* fileXfail; -} WireframeData3D[] { +} RenderWireframeData3D[] { #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) {"", MeshVisualizerGL3D::Flags{}, 1.0f, 2.0f, "wireframe3D.tga", nullptr}, @@ -647,7 +647,7 @@ const struct { Int layer; const char* file2D; const char* file3D; -} ObjectVertexPrimitiveIdData[] { +} RenderObjectVertexPrimitiveIdData[] { {"object ID", MeshVisualizerGL2D::Flag::ObjectId, MeshVisualizerGL3D::Flag::ObjectId, @@ -743,7 +743,7 @@ constexpr struct { Float lineLength; Float multiply; const char* file; -} TangentBitangentNormalData[] { +} RenderTangentBitangentNormalData[] { {"", MeshVisualizerGL3D::Flag::TangentDirection| MeshVisualizerGL3D::Flag::BitangentDirection| @@ -1221,7 +1221,7 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() { &MeshVisualizerGLTest::renderDefaultsInstancedObjectId3D, #endif }, - Containers::arraySize(InstancedObjectIdDefaultsData), + Containers::arraySize(RenderInstancedObjectIdDefaultsData), &MeshVisualizerGLTest::renderSetup, &MeshVisualizerGLTest::renderTeardown); #endif @@ -1263,7 +1263,7 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() { &MeshVisualizerGLTest::renderWireframe2D, #endif }, - Containers::arraySize(WireframeData2D), + Containers::arraySize(RenderWireframeData2D), &MeshVisualizerGLTest::renderSetup, &MeshVisualizerGLTest::renderTeardown); @@ -1274,7 +1274,7 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() { &MeshVisualizerGLTest::renderWireframe3D, #endif }, - Containers::arraySize(WireframeData3D), + Containers::arraySize(RenderWireframeData3D), &MeshVisualizerGLTest::renderSetup, &MeshVisualizerGLTest::renderTeardown); @@ -1290,7 +1290,7 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() { &MeshVisualizerGLTest::renderObjectVertexPrimitiveId3D, #endif }, - Containers::arraySize(ObjectVertexPrimitiveIdData), + Containers::arraySize(RenderObjectVertexPrimitiveIdData), &MeshVisualizerGLTest::renderSetup, &MeshVisualizerGLTest::renderTeardown); #endif @@ -1307,7 +1307,7 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() { &MeshVisualizerGLTest::renderTangentBitangentNormal, #endif }, - Containers::arraySize(TangentBitangentNormalData), + Containers::arraySize(RenderTangentBitangentNormalData), &MeshVisualizerGLTest::renderSetup, &MeshVisualizerGLTest::renderTeardown); #endif @@ -2818,7 +2818,7 @@ template void MeshVisualizerGLTest::renderDefault } template void MeshVisualizerGLTest::renderDefaultsInstancedObjectId2D() { - auto&& data = InstancedObjectIdDefaultsData[testCaseInstanceId()]; + auto&& data = RenderInstancedObjectIdDefaultsData[testCaseInstanceId()]; setTestCaseDescription(data.name); if(flag == MeshVisualizerGL2D::Flag::UniformBuffers) { @@ -2895,7 +2895,7 @@ template void MeshVisualizerGLTest::renderDefault } template void MeshVisualizerGLTest::renderDefaultsInstancedObjectId3D() { - auto&& data = InstancedObjectIdDefaultsData[testCaseInstanceId()]; + auto&& data = RenderInstancedObjectIdDefaultsData[testCaseInstanceId()]; setTestCaseDescription(data.name); if(flag == MeshVisualizerGL3D::Flag::UniformBuffers) { @@ -3320,7 +3320,7 @@ template void MeshVisualizerGLTest::renderDefault #endif template void MeshVisualizerGLTest::renderWireframe2D() { - auto&& data = WireframeData2D[testCaseInstanceId()]; + auto&& data = RenderWireframeData2D[testCaseInstanceId()]; setTestCaseDescription(data.name); #ifndef MAGNUM_TARGET_GLES2 @@ -3453,7 +3453,7 @@ template void MeshVisualizerGLTest::renderWirefra } template void MeshVisualizerGLTest::renderWireframe3D() { - auto&& data = WireframeData3D[testCaseInstanceId()]; + auto&& data = RenderWireframeData3D[testCaseInstanceId()]; setTestCaseDescription(data.name); #ifndef MAGNUM_TARGET_GLES2 @@ -3603,7 +3603,7 @@ template void MeshVisualizerGLTest::renderWirefra #ifndef MAGNUM_TARGET_GLES2 template void MeshVisualizerGLTest::renderObjectVertexPrimitiveId2D() { - auto&& data = ObjectVertexPrimitiveIdData[testCaseInstanceId()]; + auto&& data = RenderObjectVertexPrimitiveIdData[testCaseInstanceId()]; setTestCaseDescription(data.name); if(flag == MeshVisualizerGL2D::Flag::UniformBuffers) { @@ -3796,7 +3796,7 @@ template void MeshVisualizerGLTest::renderObjectV } template void MeshVisualizerGLTest::renderObjectVertexPrimitiveId3D() { - auto&& data = ObjectVertexPrimitiveIdData[testCaseInstanceId()]; + auto&& data = RenderObjectVertexPrimitiveIdData[testCaseInstanceId()]; setTestCaseDescription(data.name); if(flag == MeshVisualizerGL3D::Flag::UniformBuffers) { @@ -4050,7 +4050,7 @@ void MeshVisualizerGLTest::renderWireframe3DPerspective() { } template void MeshVisualizerGLTest::renderTangentBitangentNormal() { - auto&& data = TangentBitangentNormalData[testCaseInstanceId()]; + auto&& data = RenderTangentBitangentNormalData[testCaseInstanceId()]; setTestCaseDescription(data.name); if(flag == MeshVisualizerGL3D::Flag::UniformBuffers) {