diff --git a/src/Magnum/GL/Test/FramebufferGLTest.cpp b/src/Magnum/GL/Test/FramebufferGLTest.cpp index 1fed5ef74..93333c7c0 100644 --- a/src/Magnum/GL/Test/FramebufferGLTest.cpp +++ b/src/Magnum/GL/Test/FramebufferGLTest.cpp @@ -402,7 +402,7 @@ void FramebufferGLTest::label() { /* No-Op version is tested in AbstractObjectGLTest */ if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available"); + CORRADE_SKIP("Required extension is not supported"); Framebuffer framebuffer({{}, Vector2i(32)}); @@ -475,7 +475,7 @@ void FramebufferGLTest::attachRenderbufferMultisample() { #elif defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + CORRADE_SKIP("Neither" << Extensions::ANGLE::framebuffer_multisample::string() << "nor" << Extensions::NV::framebuffer_multisample::string() << "is supported."); #endif Renderbuffer color; @@ -1150,7 +1150,7 @@ void FramebufferGLTest::clear() { void FramebufferGLTest::clearColorI() { #ifndef MAGNUM_TARGET_GLES if(!Context::current().isVersionSupported(Version::GL300)) - CORRADE_SKIP("GL 3.0 is not available."); + CORRADE_SKIP("GL 3.0 is not supported."); #endif Renderbuffer color; @@ -1177,7 +1177,7 @@ void FramebufferGLTest::clearColorI() { void FramebufferGLTest::clearColorUI() { #ifndef MAGNUM_TARGET_GLES if(!Context::current().isVersionSupported(Version::GL300)) - CORRADE_SKIP("GL 3.0 is not available."); + CORRADE_SKIP("GL 3.0 is not supported."); #endif Renderbuffer color; @@ -1204,7 +1204,7 @@ void FramebufferGLTest::clearColorUI() { void FramebufferGLTest::clearColorF() { #ifndef MAGNUM_TARGET_GLES if(!Context::current().isVersionSupported(Version::GL300)) - CORRADE_SKIP("GL 3.0 is not available."); + CORRADE_SKIP("GL 3.0 is not supported."); #endif Renderbuffer color; @@ -1231,7 +1231,7 @@ void FramebufferGLTest::clearColorF() { void FramebufferGLTest::clearDepth() { #ifndef MAGNUM_TARGET_GLES if(!Context::current().isVersionSupported(Version::GL300)) - CORRADE_SKIP("GL 3.0 is not available."); + CORRADE_SKIP("GL 3.0 is not supported."); #endif Renderbuffer color; @@ -1274,7 +1274,7 @@ void FramebufferGLTest::clearDepth() { void FramebufferGLTest::clearStencil() { #ifndef MAGNUM_TARGET_GLES if(!Context::current().isVersionSupported(Version::GL300)) - CORRADE_SKIP("GL 3.0 is not available."); + CORRADE_SKIP("GL 3.0 is not supported."); #endif Renderbuffer color; @@ -1323,7 +1323,7 @@ void FramebufferGLTest::clearStencil() { void FramebufferGLTest::clearDepthStencil() { #ifndef MAGNUM_TARGET_GLES if(!Context::current().isVersionSupported(Version::GL300)) - CORRADE_SKIP("GL 3.0 is not available."); + CORRADE_SKIP("GL 3.0 is not supported."); #endif Renderbuffer color; @@ -2226,9 +2226,9 @@ void FramebufferGLTest::blit() { if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::framebuffer_object::string() << "is not supported."); #elif defined(MAGNUM_TARGET_GLES2) - if(!Context::current().isExtensionSupported() && - !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + if(!Context::current().isExtensionSupported() && + !Context::current().isExtensionSupported()) + CORRADE_SKIP("Neither" << Extensions::ANGLE::framebuffer_blit::string() << "nor" << Extensions::NV::framebuffer_blit::string() << "is supported."); #endif Renderbuffer colorA, colorB; diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index 70e3c52a7..30a5c935f 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -704,7 +704,7 @@ void MeshGLTest::label() { /* No-Op version is tested in AbstractObjectGLTest */ if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available"); + CORRADE_SKIP("Required extension is not supported"); Mesh mesh; @@ -2090,7 +2090,7 @@ void MeshGLTest::addVertexBufferInstancedTransferOwnwership() { if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + CORRADE_SKIP("Required extension is not supported."); #else if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ANGLE::instanced_arrays::string() << "is not supported."); @@ -2165,7 +2165,7 @@ void MeshGLTest::addVertexBufferInstancedDynamicTransferOwnwership() { if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + CORRADE_SKIP("Required extension is not supported."); #else if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ANGLE::instanced_arrays::string() << "is not supported."); @@ -2757,10 +2757,10 @@ void MeshGLTest::setBaseVertex() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not supported."); #endif Buffer vertices; @@ -2790,14 +2790,14 @@ void MeshGLTest::setBaseVertex() { void MeshGLTest::setBaseVertexNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isVersionSupported(Version::GLES320)) - CORRADE_SKIP("OpenGL ES 3.2 is available."); + CORRADE_SKIP("OpenGL ES 3.2 is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is supported."); #elif !defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is supported."); #endif constexpr UnsignedShort indexData[] = { 2, 1, 0 }; @@ -2822,14 +2822,14 @@ void MeshGLTest::setBaseVertexNoExtensionAvailable() { void MeshGLTest::setBaseVertexRangeNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isVersionSupported(Version::GLES320)) - CORRADE_SKIP("OpenGL ES 3.2 is available."); + CORRADE_SKIP("OpenGL ES 3.2 is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is supported."); #elif !defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is supported."); #endif constexpr UnsignedShort indexData[] = { 2, 1, 0 }; @@ -2868,7 +2868,7 @@ void MeshGLTest::setInstanceCount() { !Context::current().isExtensionSupported() && !Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + CORRADE_SKIP("Required extension is not supported."); #else if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ANGLE::instanced_arrays::string() << "is not supported."); @@ -2914,10 +2914,10 @@ void MeshGLTest::setInstanceCountBaseInstance() { CORRADE_SKIP(Extensions::ARB::base_instance::string() << "is not supported."); #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not supported."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not supported."); #endif typedef Attribute<0, Float> Attribute; @@ -2946,10 +2946,10 @@ void MeshGLTest::setInstanceCountBaseInstance() { void MeshGLTest::setInstanceCountBaseInstanceNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is supported."); #else if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is supported."); #endif Mesh mesh; @@ -2981,7 +2981,7 @@ void MeshGLTest::setInstanceCountIndexed() { !Context::current().isExtensionSupported() && !Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + CORRADE_SKIP("Required extension is not supported."); #else if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ANGLE::instanced_arrays::string() << "is not supported."); @@ -3029,10 +3029,10 @@ void MeshGLTest::setInstanceCountIndexedBaseInstance() { CORRADE_SKIP(Extensions::ARB::base_instance::string() << "is not supported."); #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not supported."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not supported."); #endif Buffer vertices; @@ -3062,10 +3062,10 @@ void MeshGLTest::setInstanceCountIndexedBaseInstance() { void MeshGLTest::setInstanceCountIndexedBaseInstanceNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is supported."); #else if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is supported."); #endif constexpr UnsignedShort indexData[] = { 2, 1, 0 }; @@ -3101,10 +3101,10 @@ void MeshGLTest::setInstanceCountIndexedBaseVertex() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not supported."); #endif Buffer vertices; @@ -3136,14 +3136,14 @@ void MeshGLTest::setInstanceCountIndexedBaseVertexNoExtensionAvailable() { #ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isVersionSupported(Version::GLES320)) - CORRADE_SKIP("OpenGL ES 3.2 is available."); + CORRADE_SKIP("OpenGL ES 3.2 is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is supported."); #else if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is supported."); #endif #endif @@ -3184,10 +3184,10 @@ void MeshGLTest::setInstanceCountIndexedBaseVertexBaseInstance() { CORRADE_SKIP(Extensions::ARB::base_instance::string() << "is not supported."); #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not supported."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not supported."); #endif Buffer vertices; @@ -3218,10 +3218,10 @@ void MeshGLTest::setInstanceCountIndexedBaseVertexBaseInstance() { void MeshGLTest::setInstanceCountIndexedBaseVertexBaseInstanceNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is supported."); #else if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is supported."); #endif constexpr UnsignedShort indexData[] = { 2, 1, 0 }; @@ -3258,7 +3258,7 @@ void MeshGLTest::addVertexBufferInstancedFloat() { if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + CORRADE_SKIP("Required extension is not supported."); #else if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ANGLE::instanced_arrays::string() << "is not supported."); @@ -3383,7 +3383,7 @@ void MeshGLTest::resetDivisorAfterInstancedDraw() { if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + CORRADE_SKIP("Required extension is not supported."); #else if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ANGLE::instanced_arrays::string() << "is not supported."); @@ -3809,10 +3809,10 @@ template void MeshGLTest::multiDrawIndexed() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); #elif !defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not supported."); #else CORRADE_FAIL_IF(false, "Can't do base vertex here."); #endif @@ -3887,10 +3887,10 @@ template void MeshGLTest::multiDrawIndexedSparseArrays() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); #elif !defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not supported."); #else CORRADE_FAIL_IF(false, "Can't do base vertex here."); #endif @@ -3961,10 +3961,10 @@ void MeshGLTest::multiDrawIndexedViews() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP("Neither" << Extensions::OES::draw_elements_base_vertex::string() << "nor" << Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); #elif !defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not supported."); #else CORRADE_FAIL_IF(false, "Can't do base vertex here."); #endif @@ -4092,21 +4092,21 @@ void MeshGLTest::multiDrawIndexedBaseVertexNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Neither" << Extensions::EXT::multi_draw_arrays::string() << "nor" << Extensions::ANGLE::multi_draw::string() << "is available."); + CORRADE_SKIP("Neither" << Extensions::EXT::multi_draw_arrays::string() << "nor" << Extensions::ANGLE::multi_draw::string() << "is supported."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::multi_draw::string() << "is not supported."); #endif #endif #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is supported."); #elif !defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is supported."); #endif Mesh mesh; @@ -4133,21 +4133,21 @@ void MeshGLTest::multiDrawIndexedViewsBaseVertexNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Neither" << Extensions::EXT::multi_draw_arrays::string() << "nor" << Extensions::ANGLE::multi_draw::string() << "is available."); + CORRADE_SKIP("Neither" << Extensions::EXT::multi_draw_arrays::string() << "nor" << Extensions::ANGLE::multi_draw::string() << "is supported."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw::string() << "is not available."); + CORRADE_SKIP(Extensions::WEBGL::multi_draw::string() << "is not supported."); #endif #endif #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is supported."); #elif !defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is available."); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is supported."); #endif Mesh mesh; diff --git a/src/Magnum/GL/Test/RenderbufferGLTest.cpp b/src/Magnum/GL/Test/RenderbufferGLTest.cpp index 9b6752017..5c67d02c4 100644 --- a/src/Magnum/GL/Test/RenderbufferGLTest.cpp +++ b/src/Magnum/GL/Test/RenderbufferGLTest.cpp @@ -181,7 +181,7 @@ void RenderbufferGLTest::setStorageMultisample() { #elif defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP("Required extension is not available."); + CORRADE_SKIP("Neither" << Extensions::ANGLE::framebuffer_multisample::string() << "nor" << Extensions::NV::framebuffer_multisample::string() << "is supported."); #endif Renderbuffer renderbuffer; diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index eafd8f0f7..7cd2f44d0 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -3010,7 +3010,7 @@ void MeshVisualizerGLTest::renderWireframe3DPerspective() { #ifdef MAGNUM_TARGET_GLES CORRADE_EXPECT_FAIL_IF(!GL::Context::current().isExtensionSupported(), - "GL_NV_shader_noperspective_interpolation not available."); + GL::Extensions::NV::shader_noperspective_interpolation::string() << "not supported."); #endif /* Slight rasterization differences on AMD. */