Browse Source

Fix Framebuffer test on ES2.

Accidentaly broken in d6d83fe520,
apparently not tested :/
pull/77/head
Vladimír Vondruš 12 years ago
parent
commit
f907797bc1
  1. 10
      src/Magnum/Test/FramebufferGLTest.cpp

10
src/Magnum/Test/FramebufferGLTest.cpp

@ -87,7 +87,9 @@ class FramebufferGLTest: public AbstractOpenGLTester {
void clear(); void clear();
void invalidate(); void invalidate();
#ifndef MAGNUM_TARGET_GLES2
void invalidateSub(); void invalidateSub();
#endif
void read(); void read();
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
void readBuffer(); void readBuffer();
@ -135,7 +137,9 @@ FramebufferGLTest::FramebufferGLTest() {
&FramebufferGLTest::clear, &FramebufferGLTest::clear,
&FramebufferGLTest::invalidate, &FramebufferGLTest::invalidate,
#ifndef MAGNUM_TARGET_GLES2
&FramebufferGLTest::invalidateSub, &FramebufferGLTest::invalidateSub,
#endif
&FramebufferGLTest::read, &FramebufferGLTest::read,
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
&FramebufferGLTest::readBuffer, &FramebufferGLTest::readBuffer,
@ -710,6 +714,7 @@ void FramebufferGLTest::invalidate() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
} }
#ifndef MAGNUM_TARGET_GLES2
void FramebufferGLTest::invalidateSub() { void FramebufferGLTest::invalidateSub() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::framebuffer_object>()) if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::framebuffer_object>())
@ -717,11 +722,7 @@ void FramebufferGLTest::invalidateSub() {
#endif #endif
Renderbuffer color; Renderbuffer color;
#ifndef MAGNUM_TARGET_GLES2
color.setStorage(RenderbufferFormat::RGBA8, Vector2i(128)); color.setStorage(RenderbufferFormat::RGBA8, Vector2i(128));
#else
color.setStorage(RenderbufferFormat::RGBA4, Vector2i(128));
#endif
Renderbuffer depth; Renderbuffer depth;
depth.setStorage(RenderbufferFormat::DepthComponent16, Vector2i(128)); depth.setStorage(RenderbufferFormat::DepthComponent16, Vector2i(128));
@ -738,6 +739,7 @@ void FramebufferGLTest::invalidateSub() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
} }
#endif
void FramebufferGLTest::read() { void FramebufferGLTest::read() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES

Loading…
Cancel
Save