From c3fbf45f46714bedf8d24d6a51177b643300e1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 19 Oct 2021 15:50:47 +0200 Subject: [PATCH] GL: remove last remaining std::string concatenations from CORRADE_SKIP(). Not sure why these were still there. Everything got fixed in 65a935cedc059bab49172b9a198e3ccc6b346bdc except these few. --- src/Magnum/GL/Test/AbstractObjectGLTest.cpp | 4 +- src/Magnum/GL/Test/MeshGLTest.cpp | 92 +++++++++---------- .../GL/Test/TransformFeedbackGLTest.cpp | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/Magnum/GL/Test/AbstractObjectGLTest.cpp b/src/Magnum/GL/Test/AbstractObjectGLTest.cpp index 9a72bd1df..b6fbcdff1 100644 --- a/src/Magnum/GL/Test/AbstractObjectGLTest.cpp +++ b/src/Magnum/GL/Test/AbstractObjectGLTest.cpp @@ -44,9 +44,9 @@ AbstractObjectGLTest::AbstractObjectGLTest() { void AbstractObjectGLTest::labelNoOp() { if(Context::current().isExtensionSupported()) - CORRADE_SKIP(GL::Extensions::KHR::debug::string() + std::string(" is supported.")); + CORRADE_SKIP(GL::Extensions::KHR::debug::string() << "is supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(GL::Extensions::EXT::debug_label::string() + std::string(" is supported.")); + CORRADE_SKIP(GL::Extensions::EXT::debug_label::string() << "is supported."); Buffer buffer; buffer.setLabel("MyBuffer"); diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index d3243d423..80ad0de70 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -2446,7 +2446,7 @@ void MeshGLTest::unbindVAOWhenSettingIndexBufferData() { if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::vertex_array_object::string() << "is not supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ARB::direct_state_access::string() + std::string(" is active which circumvents the issue tested here.")); + CORRADE_SKIP(Extensions::ARB::direct_state_access::string() << "is active which circumvents the issue tested here."); #elif defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::OES::vertex_array_object::string() << "is not supported."); @@ -2501,7 +2501,7 @@ void MeshGLTest::unbindIndexBufferWhenBindingVao() { if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::vertex_array_object::string() << "is not supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ARB::direct_state_access::string() + std::string(" is active which circumvents the issue tested here.")); + CORRADE_SKIP(Extensions::ARB::direct_state_access::string() << "is active which circumvents the issue tested here."); #elif defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::OES::vertex_array_object::string() << "is not supported."); @@ -2563,7 +2563,7 @@ void MeshGLTest::resetIndexBufferBindingWhenBindingVao() { if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::vertex_array_object::string() << "is not supported."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ARB::direct_state_access::string() + std::string(" is active which circumvents the issue tested here.")); + CORRADE_SKIP(Extensions::ARB::direct_state_access::string() << "is active which circumvents the issue tested here."); #elif defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::OES::vertex_array_object::string() << "is not supported."); @@ -2755,10 +2755,10 @@ void MeshGLTest::setBaseVertex() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP(std::string{"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 available."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); #endif Buffer vertices; @@ -2790,12 +2790,12 @@ void MeshGLTest::setBaseVertexNoExtensionAvailable() { if(Context::current().isVersionSupported(Version::GLES320)) CORRADE_SKIP("OpenGL ES 3.2 is available."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); #elif !defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); #endif constexpr UnsignedShort indexData[] = { 2, 1, 0 }; @@ -2822,12 +2822,12 @@ void MeshGLTest::setBaseVertexRangeNoExtensionAvailable() { if(Context::current().isVersionSupported(Version::GLES320)) CORRADE_SKIP("OpenGL ES 3.2 is available."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); #elif !defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); #endif constexpr UnsignedShort indexData[] = { 2, 1, 0 }; @@ -2912,10 +2912,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() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not available."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); #endif typedef Attribute<0, Float> Attribute; @@ -2944,10 +2944,10 @@ void MeshGLTest::setInstanceCountBaseInstance() { void MeshGLTest::setInstanceCountBaseInstanceNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is available."); #else if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); #endif Mesh mesh; @@ -3027,10 +3027,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() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not available."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); #endif Buffer vertices; @@ -3060,10 +3060,10 @@ void MeshGLTest::setInstanceCountIndexedBaseInstance() { void MeshGLTest::setInstanceCountIndexedBaseInstanceNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is available."); #else if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); #endif constexpr UnsignedShort indexData[] = { 2, 1, 0 }; @@ -3099,10 +3099,10 @@ void MeshGLTest::setInstanceCountIndexedBaseVertex() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP(std::string{"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 available."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); #endif Buffer vertices; @@ -3136,12 +3136,12 @@ void MeshGLTest::setInstanceCountIndexedBaseVertexNoExtensionAvailable() { if(Context::current().isVersionSupported(Version::GLES320)) CORRADE_SKIP("OpenGL ES 3.2 is available."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); #else if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); #endif #endif @@ -3182,10 +3182,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() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is not available."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is not available."); #endif Buffer vertices; @@ -3216,10 +3216,10 @@ void MeshGLTest::setInstanceCountIndexedBaseVertexBaseInstance() { void MeshGLTest::setInstanceCountIndexedBaseVertexBaseInstanceNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::ANGLE::base_vertex_base_instance::string() << "is available."); #else if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::WEBGL::draw_instanced_base_vertex_base_instance::string() << "is available."); #endif constexpr UnsignedShort indexData[] = { 2, 1, 0 }; @@ -3391,10 +3391,10 @@ void MeshGLTest::resetDivisorAfterInstancedDraw() { /* This doesn't affect VAOs, because they encapsulate the state */ #ifndef MAGNUM_TARGET_GLES if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::ARB::vertex_array_object::string() + std::string(" is enabled, can't test.")); + CORRADE_SKIP(Extensions::ARB::vertex_array_object::string() << "is enabled, can't test."); #elif defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::vertex_array_object::string() + std::string(" is enabled, can't test.")); + CORRADE_SKIP(Extensions::OES::vertex_array_object::string() << "is enabled, can't test."); #endif typedef Attribute<0, Float> Attribute; @@ -3794,10 +3794,10 @@ void MeshGLTest::multiDrawIndexed() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP(std::string{"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 available."); #elif !defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not available."); #else CORRADE_FAIL_IF(false, "Can't do base vertex here."); #endif @@ -3862,10 +3862,10 @@ void MeshGLTest::multiDrawIndexedSparseArrays() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP(std::string{"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 available."); #elif !defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not available."); #else CORRADE_FAIL_IF(false, "Can't do base vertex here."); #endif @@ -3947,10 +3947,10 @@ void MeshGLTest::multiDrawIndexedViews() { #elif !defined(MAGNUM_TARGET_WEBGL) if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP(std::string{"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 available."); #elif !defined(MAGNUM_TARGET_GLES2) if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not available."); #else CORRADE_FAIL_IF(false, "Can't do base vertex here."); #endif @@ -4078,21 +4078,21 @@ void MeshGLTest::multiDrawIndexedBaseVertexNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP(std::string{"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 available."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::multi_draw::string() << "is not available."); #endif #endif #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); #elif !defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is available."); #endif Mesh mesh; @@ -4119,21 +4119,21 @@ void MeshGLTest::multiDrawIndexedViewsBaseVertexNoExtensionAvailable() { #ifndef MAGNUM_TARGET_WEBGL if(!Context::current().isExtensionSupported() && !Context::current().isExtensionSupported()) - CORRADE_SKIP(std::string{"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 available."); #else if(!Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw::string() + std::string{" is not available."}); + CORRADE_SKIP(Extensions::WEBGL::multi_draw::string() << "is not available."); #endif #endif #ifndef MAGNUM_TARGET_WEBGL if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::EXT::draw_elements_base_vertex::string() << "is available."); if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::OES::draw_elements_base_vertex::string() << "is available."); #elif !defined(MAGNUM_TARGET_GLES2) if(Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() + std::string{" is available."}); + CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is available."); #endif Mesh mesh; diff --git a/src/Magnum/GL/Test/TransformFeedbackGLTest.cpp b/src/Magnum/GL/Test/TransformFeedbackGLTest.cpp index d9be9ac8a..801929181 100644 --- a/src/Magnum/GL/Test/TransformFeedbackGLTest.cpp +++ b/src/Magnum/GL/Test/TransformFeedbackGLTest.cpp @@ -586,7 +586,7 @@ void TransformFeedbackGLTest::draw() { if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::transform_feedback2::string() << "is not supported."); if(DrawData[testCaseInstanceId()].stream && (!Context::current().isExtensionSupported() || TransformFeedback::maxVertexStreams() < 2)) - CORRADE_SKIP(Extensions::ARB::transform_feedback3::string() + std::string(" is not supported well enough.")); + CORRADE_SKIP(Extensions::ARB::transform_feedback3::string() << "is not supported well enough."); if(DrawData[testCaseInstanceId()].instances && !Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::transform_feedback_instanced::string() << "is not supported.");