From 0ca968d2244214b465f1186628328f28caa33886 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Thu, 17 Sep 2009 10:24:34 +0200 Subject: Skip the multipleFBOInterleavedRendering autotest on when using OpenGL 1 Interleaved rendering to GL targets is going to be flaky with the GL1 engine and wont be supported. Reviewed-by: Trustme --- tests/auto/qgl/tst_qgl.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index 60a3f87..21f7359 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -967,6 +967,11 @@ void tst_QGL::multipleFBOInterleavedRendering() QVERIFY(fbo2Painter.begin(fbo2)); QVERIFY(fbo3Painter.begin(fbo3)); + // Confirm we're using the GL2 engine, as interleaved rendering isn't supported + // on the GL1 engine: + if (fbo1Painter.paintEngine()->type() != QPaintEngine::OpenGL2) + QSKIP("Interleaved GL rendering requires OpenGL 2.0 or higher", SkipSingle); + QPainterPath intersectingPath; intersectingPath.moveTo(0, 0); intersectingPath.lineTo(100, 0); -- cgit v0.12