diff options
| author | Brian Paul <brianp@vmware.com> | 2009-01-19 16:12:17 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-22 15:22:54 -0700 |
| commit | aed7403f32d71d6791678b356801c2b790c17686 (patch) | |
| tree | 7d95ec0fdc9a35c65443e388a186315859830449 | |
| parent | 1b199101ffd50e59372e1ecafaae48f369169292 (diff) | |
demos: updated FBO tests to for ARB_fbo
Some things that were not errors in EXT_fbo are errors in ARB_fbo.
| -rw-r--r-- | progs/tests/fbotest1.c | 15 | ||||
| -rw-r--r-- | progs/tests/fbotexture.c | 7 |
2 files changed, 15 insertions, 7 deletions
diff --git a/progs/tests/fbotest1.c b/progs/tests/fbotest1.c index 8f4569ff3b4..ab2757c3c3d 100644 --- a/progs/tests/fbotest1.c +++ b/progs/tests/fbotest1.c @@ -122,6 +122,7 @@ Key( unsigned char key, int x, int y ) static void Init( void ) { + GLboolean ARB_fbo = glutExtensionSupported("GL_ARB_framebuffer_object"); GLint i; if (!glutExtensionSupported("GL_EXT_framebuffer_object")) { @@ -133,16 +134,20 @@ Init( void ) glGenFramebuffersEXT(1, &MyFB); assert(MyFB); assert(!glIsFramebufferEXT(MyFB)); - glDeleteFramebuffersEXT(1, &MyFB); - assert(!glIsFramebufferEXT(MyFB)); + if (!ARB_fbo) { + glDeleteFramebuffersEXT(1, &MyFB); + assert(!glIsFramebufferEXT(MyFB)); + } /* Note, continue to use MyFB below */ glGenRenderbuffersEXT(1, &MyRB); assert(MyRB); assert(!glIsRenderbufferEXT(MyRB)); - glDeleteRenderbuffersEXT(1, &MyRB); - assert(!glIsRenderbufferEXT(MyRB)); - MyRB = 42; /* an arbitrary ID */ + if (!ARB_fbo) { + glDeleteRenderbuffersEXT(1, &MyRB); + assert(!glIsRenderbufferEXT(MyRB)); + MyRB = 42; /* an arbitrary ID */ + } glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, MyFB); assert(glIsFramebufferEXT(MyFB)); diff --git a/progs/tests/fbotexture.c b/progs/tests/fbotexture.c index 88d0549c808..fa231abddb6 100644 --- a/progs/tests/fbotexture.c +++ b/progs/tests/fbotexture.c @@ -310,6 +310,7 @@ static void Init(int argc, char *argv[]) { static const GLfloat mat[4] = { 1.0, 0.5, 0.5, 1.0 }; + GLboolean ARB_fbo = glutExtensionSupported("GL_ARB_framebuffer_object"); GLint i; if (!glutExtensionSupported("GL_EXT_framebuffer_object")) { @@ -332,8 +333,10 @@ Init(int argc, char *argv[]) glGenFramebuffersEXT(1, &MyFB); assert(MyFB); assert(!glIsFramebufferEXT(MyFB)); - glDeleteFramebuffersEXT(1, &MyFB); - assert(!glIsFramebufferEXT(MyFB)); + if (!ARB_fbo) { + glDeleteFramebuffersEXT(1, &MyFB); + assert(!glIsFramebufferEXT(MyFB)); + } /* Note, continue to use MyFB below */ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, MyFB); |