From 5f8120a31731ded6bad9114f970a159497ae01f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 21 Dec 2022 13:39:27 +0100 Subject: [PATCH] GL: print info about used multi-draw extensions before any test skips. For clearer output, otherwise it may seem that certain test case instances don't even check the multidraw extension. --- src/Magnum/GL/Test/MeshGLTest.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index cca28fc73..496b3523c 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -4299,6 +4299,17 @@ void MeshGLTest::multiDrawIndexedViews() { auto&& data = MultiDrawIndexedData[testCaseInstanceId()]; setTestCaseDescription(data.name); + #ifdef MAGNUM_TARGET_GLES + #ifndef MAGNUM_TARGET_WEBGL + if(!Context::current().isExtensionSupported() && + !Context::current().isExtensionSupported()) + CORRADE_INFO("Neither" << Extensions::EXT::multi_draw_arrays::string() << "nor" << Extensions::ANGLE::multi_draw::string() << "is supported, using fallback implementation"); + #else + if(!Context::current().isExtensionSupported()) + CORRADE_INFO(Extensions::WEBGL::multi_draw::string() << "is not supported, using fallback implementation"); + #endif + #endif + #ifndef MAGNUM_TARGET_GLES2 if(data.vertexId && !GL::Context::current().isExtensionSupported()) CORRADE_SKIP("gl_VertexID not supported"); @@ -4336,17 +4347,6 @@ void MeshGLTest::multiDrawIndexedViews() { #endif } - #ifdef MAGNUM_TARGET_GLES - #ifndef MAGNUM_TARGET_WEBGL - if(!Context::current().isExtensionSupported() && - !Context::current().isExtensionSupported()) - CORRADE_INFO("Neither" << Extensions::EXT::multi_draw_arrays::string() << "nor" << Extensions::ANGLE::multi_draw::string() << "is supported, using fallback implementation"); - #else - if(!Context::current().isExtensionSupported()) - CORRADE_INFO(Extensions::WEBGL::multi_draw::string() << "is not supported, using fallback implementation"); - #endif - #endif - const struct { Vector2 position; Vector4 value;