demos: updated FBO tests to for ARB_fbo
Some things that were not errors in EXT_fbo are errors in ARB_fbo.
This commit is contained in:
+10
-5
@@ -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));
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user