diff --git a/src/Magnum/DebugTools/Test/ForceRendererGLTest.cpp b/src/Magnum/DebugTools/Test/ForceRendererGLTest.cpp index ee8775f5d..f40ec13c9 100644 --- a/src/Magnum/DebugTools/Test/ForceRendererGLTest.cpp +++ b/src/Magnum/DebugTools/Test/ForceRendererGLTest.cpp @@ -111,7 +111,7 @@ void ForceRendererGLTest::render2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* ARM Mali G71 (Huawei P10) has some rounding differences causing the the arrowhead to be on a different place (but the rest is okay and the @@ -167,7 +167,7 @@ void ForceRendererGLTest::render3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); { CORRADE_EXPECT_FAIL("I'm unable to convince it to orient the arrowhead correctly in 3D."); diff --git a/src/Magnum/GL/Test/RendererGLTest.cpp b/src/Magnum/GL/Test/RendererGLTest.cpp index 331c885eb..c77d1ea76 100644 --- a/src/Magnum/GL/Test/RendererGLTest.cpp +++ b/src/Magnum/GL/Test/RendererGLTest.cpp @@ -221,7 +221,7 @@ void RendererGLTest::pointCoord() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) const Float maxThreshold = 0.0f, meanThreshold = 0.0f; diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp index 5ceccbe1b..5f78799f8 100644 --- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -270,7 +270,7 @@ constexpr GL::TextureFormat TextureFormatR = void DistanceFieldVectorGLTest::renderDefaults2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh square = MeshTools::compile(Primitives::squareSolid(Primitives::SquareFlag::TextureCoordinates)); @@ -326,7 +326,7 @@ void DistanceFieldVectorGLTest::renderDefaults2D() { void DistanceFieldVectorGLTest::renderDefaults3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh plane = MeshTools::compile(Primitives::planeSolid(Primitives::PlaneFlag::TextureCoordinates)); @@ -385,7 +385,7 @@ void DistanceFieldVectorGLTest::render2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh square = MeshTools::compile(Primitives::squareSolid(Primitives::SquareFlag::TextureCoordinates)); @@ -451,7 +451,7 @@ void DistanceFieldVectorGLTest::render3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh plane = MeshTools::compile(Primitives::planeSolid(Primitives::PlaneFlag::TextureCoordinates)); diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index 902b2451e..809c44e55 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -464,7 +464,7 @@ void FlatGLTest::renderDefaults2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); CORRADE_COMPARE_WITH( /* Dropping the alpha channel, as it's always 1.0 */ @@ -484,7 +484,7 @@ void FlatGLTest::renderDefaults3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); CORRADE_COMPARE_WITH( /* Dropping the alpha channel, as it's always 1.0 */ @@ -506,7 +506,7 @@ void FlatGLTest::renderColored2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) const Float maxThreshold = 0.0f, meanThreshold = 0.0f; @@ -537,7 +537,7 @@ void FlatGLTest::renderColored3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) /* SwiftShader has 5 different pixels on the edges */ @@ -590,7 +590,7 @@ void FlatGLTest::renderSinglePixelTextured2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) /* SwiftShader has 5 different pixels on the edges */ @@ -632,7 +632,7 @@ void FlatGLTest::renderSinglePixelTextured3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) /* SwiftShader has 5 different pixels on the edges */ @@ -654,7 +654,7 @@ void FlatGLTest::renderTextured2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh circle = MeshTools::compile(Primitives::circle2DSolid(32, Primitives::Circle2DFlag::TextureCoordinates)); @@ -710,7 +710,7 @@ void FlatGLTest::renderTextured3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh sphere = MeshTools::compile(Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates)); @@ -769,7 +769,7 @@ template void FlatGLTest::renderVertexColor2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Trade::MeshData circleData = Primitives::circle2DSolid(32, Primitives::Circle2DFlag::TextureCoordinates); @@ -823,7 +823,7 @@ template void FlatGLTest::renderVertexColor3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Trade::MeshData sphereData = Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates); @@ -896,7 +896,7 @@ void FlatGLTest::renderAlpha2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Containers::Optional image; Containers::Pointer importer = _manager.loadAndInstantiate("AnyImageImporter"); @@ -947,7 +947,7 @@ void FlatGLTest::renderAlpha3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Containers::Optional image; Containers::Pointer importer = _manager.loadAndInstantiate("AnyImageImporter"); @@ -1068,7 +1068,7 @@ void FlatGLTest::renderObjectId2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* Color output should have no difference -- same as in colored2D() */ #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) @@ -1130,7 +1130,7 @@ void FlatGLTest::renderObjectId3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* Color output should have no difference -- same as in colored3D() */ #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) @@ -1181,7 +1181,7 @@ void FlatGLTest::renderInstanced2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh circle = MeshTools::compile(Primitives::circle2DSolid(32, Primitives::Circle2DFlag::TextureCoordinates)); @@ -1265,7 +1265,7 @@ void FlatGLTest::renderInstanced3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh sphere = MeshTools::compile(Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates)); diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index c24439e28..563c13caa 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -981,7 +981,7 @@ void MeshVisualizerGLTest::renderDefaultsWireframe2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); { CORRADE_EXPECT_FAIL("Defaults don't work for wireframe as line width is derived from viewport size."); @@ -1030,7 +1030,7 @@ void MeshVisualizerGLTest::renderDefaultsWireframe3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); { CORRADE_EXPECT_FAIL("Defaults don't work for wireframe as line width is derived from viewport size."); @@ -1097,7 +1097,7 @@ void MeshVisualizerGLTest::renderDefaultsObjectId2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); CORRADE_COMPARE_WITH( /* Dropping the alpha channel, as it's always 1.0 */ @@ -1146,7 +1146,7 @@ void MeshVisualizerGLTest::renderDefaultsObjectId3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); CORRADE_COMPARE_WITH( /* Dropping the alpha channel, as it's always 1.0 */ @@ -1159,7 +1159,7 @@ void MeshVisualizerGLTest::renderDefaultsObjectId3D() { void MeshVisualizerGLTest::renderDefaultsVertexId2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* On SwiftShader gl_VertexID doesn't work in this case, skipping */ if(!GL::Context::current().isExtensionSupported()) @@ -1181,7 +1181,7 @@ void MeshVisualizerGLTest::renderDefaultsVertexId2D() { void MeshVisualizerGLTest::renderDefaultsVertexId3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* On SwiftShader gl_VertexID doesn't work in this case, skipping */ if(!GL::Context::current().isExtensionSupported()) @@ -1202,7 +1202,7 @@ void MeshVisualizerGLTest::renderDefaultsVertexId3D() { void MeshVisualizerGLTest::renderDefaultsPrimitiveId2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* Interestingly in this case gl_VertexID in SwiftShader works (thus not checking for MAGNUM_shader_vertex_id -- maybe it works only for @@ -1254,7 +1254,7 @@ void MeshVisualizerGLTest::renderDefaultsPrimitiveId2D() { void MeshVisualizerGLTest::renderDefaultsPrimitiveId3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* Interestingly in this case gl_VertexID in SwiftShader works (thus not checking for MAGNUM_shader_vertex_id -- maybe it works only for @@ -1327,7 +1327,7 @@ void MeshVisualizerGLTest::renderDefaultsTangentBitangentNormal() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); MAGNUM_VERIFY_NO_GL_ERROR(); @@ -1395,7 +1395,7 @@ void MeshVisualizerGLTest::renderWireframe2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); { CORRADE_EXPECT_FAIL_IF(data.flags & MeshVisualizer2D::Flag::NoGeometryShader, @@ -1489,7 +1489,7 @@ void MeshVisualizerGLTest::renderWireframe3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); { CORRADE_EXPECT_FAIL_IF(data.flags & MeshVisualizer3D::Flag::NoGeometryShader, @@ -1622,7 +1622,7 @@ void MeshVisualizerGLTest::renderObjectVertexPrimitiveId2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); CORRADE_COMPARE_WITH( /* Dropping the alpha channel, as it's always 1.0 */ @@ -1720,7 +1720,7 @@ void MeshVisualizerGLTest::renderObjectVertexPrimitiveId3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* Release build has 1 pixel slightly off. Huh. AMD & llvmpipe has additional off-by-one errors compared to Intel, SwiftShader some errors @@ -1769,7 +1769,7 @@ void MeshVisualizerGLTest::renderWireframe3DPerspective() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #ifdef MAGNUM_TARGET_GLES CORRADE_EXPECT_FAIL_IF(!GL::Context::current().isExtensionSupported(), @@ -1909,7 +1909,7 @@ void MeshVisualizerGLTest::renderTangentBitangentNormal() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* Slight rasterization differences on AMD. If GL_NV_shader_noperspective_interpolation is not supported, the artifacts diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index f162bd319..9d75cd6f8 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -794,7 +794,7 @@ void PhongGLTest::renderDefaults() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) /* SwiftShader has 6 different pixels on the edges and a bunch of small @@ -834,7 +834,7 @@ void PhongGLTest::renderColored() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) /* SwiftShader has some minor rounding differences (max = 1). ARM Mali G71 @@ -920,7 +920,7 @@ void PhongGLTest::renderSinglePixelTextured() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) /* SwiftShader has some minor rounding differences (max = 1). ARM Mali G71 @@ -943,7 +943,7 @@ void PhongGLTest::renderTextured() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh sphere = MeshTools::compile(Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates)); @@ -1042,7 +1042,7 @@ void PhongGLTest::renderTexturedNormal() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Containers::Pointer importer = _manager.loadAndInstantiate("AnyImageImporter"); CORRADE_VERIFY(importer); @@ -1141,7 +1141,7 @@ template void PhongGLTest::renderVertexColor() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Trade::MeshData sphereData = Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates); @@ -1221,7 +1221,7 @@ void PhongGLTest::renderShininess() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); { #ifdef CORRADE_TARGET_IOS @@ -1307,7 +1307,7 @@ void PhongGLTest::renderAlpha() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Containers::Optional image; Containers::Pointer importer = _manager.loadAndInstantiate("AnyImageImporter"); @@ -1460,7 +1460,7 @@ void PhongGLTest::renderObjectId() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); /* Color output should have no difference -- same as in colored() */ #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) @@ -1531,7 +1531,7 @@ void PhongGLTest::renderLights() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) const Float maxThreshold = 3.0f, meanThreshold = 0.02f; @@ -1578,7 +1578,7 @@ void PhongGLTest::renderLightsSetOneByOne() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) const Float maxThreshold = 3.0f, meanThreshold = 0.02f; @@ -1619,7 +1619,7 @@ void PhongGLTest::renderLowLightAngle() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) const Float maxThreshold = 63.0f, meanThreshold = 0.36f; @@ -1639,7 +1639,7 @@ void PhongGLTest::renderZeroLights() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh sphere = MeshTools::compile(Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates)); @@ -1766,7 +1766,7 @@ void PhongGLTest::renderInstanced() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh sphere = MeshTools::compile(Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates| diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp index f6cd5ccd2..74430d244 100644 --- a/src/Magnum/Shaders/Test/VectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp @@ -265,7 +265,7 @@ constexpr GL::TextureFormat TextureFormatR = void VectorGLTest::renderDefaults2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh square = MeshTools::compile(Primitives::squareSolid(Primitives::SquareFlag::TextureCoordinates)); @@ -312,7 +312,7 @@ void VectorGLTest::renderDefaults2D() { void VectorGLTest::renderDefaults3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh plane = MeshTools::compile(Primitives::planeSolid(Primitives::PlaneFlag::TextureCoordinates)); @@ -362,7 +362,7 @@ void VectorGLTest::render2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh square = MeshTools::compile(Primitives::squareSolid(Primitives::SquareFlag::TextureCoordinates)); @@ -424,7 +424,7 @@ void VectorGLTest::render3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); GL::Mesh plane = MeshTools::compile(Primitives::planeSolid(Primitives::PlaneFlag::TextureCoordinates)); diff --git a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp index 0f283a83e..43b73e1e2 100644 --- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp @@ -214,7 +214,7 @@ template void VertexColorGLTest::renderDefaults2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) /* SwiftShader has differently rasterized edges on eight pixels */ @@ -235,7 +235,7 @@ template void VertexColorGLTest::renderDefaults3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Trade::MeshData sphereData = Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates); @@ -291,7 +291,7 @@ template void VertexColorGLTest::render2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); #if !(defined(MAGNUM_TARGET_GLES2) && defined(MAGNUM_TARGET_WEBGL)) /* AMD has minor rounding differences in the gradient compared to Intel, @@ -313,7 +313,7 @@ template void VertexColorGLTest::render3D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) - CORRADE_SKIP("AnyImageImporter / TgaImageImporter plugins not found."); + CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found."); Trade::MeshData sphereData = Primitives::uvSphereSolid(16, 32, Primitives::UVSphereFlag::TextureCoordinates);