From bdc77c744b9ef12e1a665c19738de10ce81e3f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 7 Jan 2014 16:11:21 +0100 Subject: [PATCH] Verify that framebuffer extension is available for test on desktop GL. --- src/Test/FramebufferGLTest.cpp | 15 +++++++++++++++ src/Test/RenderbufferGLTest.cpp | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/Test/FramebufferGLTest.cpp b/src/Test/FramebufferGLTest.cpp index f02fcd538..5546e2bcf 100644 --- a/src/Test/FramebufferGLTest.cpp +++ b/src/Test/FramebufferGLTest.cpp @@ -49,6 +49,11 @@ FramebufferGLTest::FramebufferGLTest() { } void FramebufferGLTest::construct() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + { const Framebuffer framebuffer({{32, 16}, {128, 256}}); @@ -69,6 +74,11 @@ void FramebufferGLTest::constructCopy() { } void FramebufferGLTest::constructMove() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + Framebuffer a({{32, 16}, {128, 256}}); const Int id = a.id(); @@ -93,6 +103,11 @@ void FramebufferGLTest::constructMove() { } void FramebufferGLTest::label() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + /* No-Op version is tested in AbstractObjectGLTest */ if(!Context::current()->isExtensionSupported() && !Context::current()->isExtensionSupported()) diff --git a/src/Test/RenderbufferGLTest.cpp b/src/Test/RenderbufferGLTest.cpp index 58572a93b..3d79a4d19 100644 --- a/src/Test/RenderbufferGLTest.cpp +++ b/src/Test/RenderbufferGLTest.cpp @@ -49,6 +49,11 @@ RenderbufferGLTest::RenderbufferGLTest() { } void RenderbufferGLTest::construct() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + { const Renderbuffer renderbuffer; @@ -68,6 +73,11 @@ void RenderbufferGLTest::constructCopy() { } void RenderbufferGLTest::constructMove() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + Renderbuffer a; const Int id = a.id(); @@ -90,6 +100,11 @@ void RenderbufferGLTest::constructMove() { } void RenderbufferGLTest::label() { + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) + CORRADE_SKIP(Extensions::GL::ARB::framebuffer_object::string() + std::string(" is not available.")); + #endif + /* No-Op version is tested in AbstractObjectGLTest */ if(!Context::current()->isExtensionSupported() && !Context::current()->isExtensionSupported())