From 96fa501f0b410798d3b49fb60d1c81708d00c576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 12 Apr 2017 00:16:26 +0200 Subject: [PATCH] Test: don't even try if there are not enough XFB streams available. Fixes unnecessary test failure on soft Mesa. --- src/Magnum/Test/TransformFeedbackGLTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Test/TransformFeedbackGLTest.cpp b/src/Magnum/Test/TransformFeedbackGLTest.cpp index 0de07d272..53058a1be 100644 --- a/src/Magnum/Test/TransformFeedbackGLTest.cpp +++ b/src/Magnum/Test/TransformFeedbackGLTest.cpp @@ -551,16 +551,16 @@ void TransformFeedbackGLTest::interleaved() { } void TransformFeedbackGLTest::draw() { + setTestCaseDescription(DrawData[testCaseInstanceId()].name); + /* ARB_transform_feedback2 needed as base, other optional */ if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::GL::ARB::transform_feedback2::string() + std::string(" is not supported.")); - if(DrawData[testCaseInstanceId()].stream && !Context::current().isExtensionSupported()) - CORRADE_SKIP(Extensions::GL::ARB::transform_feedback3::string() + std::string(" is not supported.")); + if(DrawData[testCaseInstanceId()].stream && (!Context::current().isExtensionSupported() || TransformFeedback::maxVertexStreams() < 2)) + CORRADE_SKIP(Extensions::GL::ARB::transform_feedback3::string() + std::string(" is not supported well enough.")); if(DrawData[testCaseInstanceId()].instances && !Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::GL::ARB::transform_feedback_instanced::string() + std::string(" is not supported.")); - setTestCaseDescription(DrawData[testCaseInstanceId()].name); - /* Bind some FB to avoid errors on contexts w/o default FB */ Renderbuffer color; color.setStorage(RenderbufferFormat::RGBA8, Vector2i{1});