From a554fbdfcf83873eea633efa1e7bd2a3dc22f54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Thu, 3 Sep 2009 14:39:01 +0200 Subject: Fixed compilation of tst_qgl. Commit 66961012e6eb494541bdc166e21f7af55eef73a5 changed the QGLFramebufferObjectFormat API, so the test needed to be updated as well. Reviewed-by: Kim --- tests/auto/qgl/tst_qgl.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index d87a29c..77e32ef 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -725,7 +725,8 @@ void tst_QGL::glFBORendering() glw.makeCurrent(); // No multisample with combined depth/stencil attachment: - QGLFramebufferObjectFormat fboFormat(0, QGLFramebufferObject::CombinedDepthStencil); + QGLFramebufferObjectFormat fboFormat; + fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil); // Don't complicate things by using NPOT: QGLFramebufferObject *fbo = new QGLFramebufferObject(256, 128, fboFormat); @@ -785,7 +786,8 @@ void tst_QGL::multipleFBOInterleavedRendering() glw.makeCurrent(); // No multisample with combined depth/stencil attachment: - QGLFramebufferObjectFormat fboFormat(0, QGLFramebufferObject::CombinedDepthStencil); + QGLFramebufferObjectFormat fboFormat; + fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil); QGLFramebufferObject *fbo1 = new QGLFramebufferObject(256, 128, fboFormat); QGLFramebufferObject *fbo2 = new QGLFramebufferObject(256, 128, fboFormat); @@ -890,7 +892,8 @@ protected: { QPainter widgetPainter; widgetPainterBeginOk = widgetPainter.begin(this); - QGLFramebufferObjectFormat fboFormat(0, QGLFramebufferObject::CombinedDepthStencil); + QGLFramebufferObjectFormat fboFormat; + fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil); QGLFramebufferObject *fbo = new QGLFramebufferObject(128, 128, fboFormat); QPainter fboPainter; @@ -1018,7 +1021,8 @@ void tst_QGL::stackedFBOs() glw.makeCurrent(); // No multisample with combined depth/stencil attachment: - QGLFramebufferObjectFormat fboFormat(0, QGLFramebufferObject::CombinedDepthStencil); + QGLFramebufferObjectFormat fboFormat; + fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil); // Don't complicate things by using NPOT: QGLFramebufferObject *fbo1 = new QGLFramebufferObject(128, 128, fboFormat); -- cgit v0.12