summaryrefslogtreecommitdiff
path: root/progs/demos
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-03-01 03:36:40 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-03-01 03:36:40 +0000
commit058a3ab4cbfba0d5ae229c21c6907e38f594cc55 (patch)
treea723344b15983a1e97b8551eb44307675e70f2ba /progs/demos
parentaae9db03e43c36d164a86e2b512202ac510b8084 (diff)
test for GL 1.2
Diffstat (limited to 'progs/demos')
-rw-r--r--progs/demos/texobj.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/progs/demos/texobj.c b/progs/demos/texobj.c
index 56915a7c08..faf829045f 100644
--- a/progs/demos/texobj.c
+++ b/progs/demos/texobj.c
@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.2 2000/02/25 23:24:06 brianp Exp $ */
+/* $Id: texobj.c,v 1.3 2000/03/01 03:36:40 brianp Exp $ */
/*
* Example of using the 1.1 texture object functions.
@@ -10,6 +10,9 @@
/*
* $Log: texobj.c,v $
+ * Revision 1.3 2000/03/01 03:36:40 brianp
+ * test for GL 1.2
+ *
* Revision 1.2 2000/02/25 23:24:06 brianp
* fixed bug when using display lists
*
@@ -37,7 +40,7 @@ static GLfloat Angle = 0.0f;
static GLboolean HaveTexObj = GL_FALSE;
-#if defined(GL_VERSION_1_1)
+#if defined(GL_VERSION_1_1) || defined(GL_VERSION_1_2)
# define TEXTURE_OBJECT 1
#elif defined(GL_EXT_texture_object)
# define TEXTURE_OBJECT 1
@@ -275,7 +278,8 @@ int main( int argc, char *argv[] )
char *exten = (char *) glGetString( GL_EXTENSIONS );
char *version = (char *) glGetString( GL_VERSION );
if ( strstr( exten, "GL_EXT_texture_object" )
- || strncmp( version, "1.1", 3 )==0 ) {
+ || strncmp( version, "1.1", 3 )==0
+ || strncmp( version, "1.2", 3 )==0 ) {
HaveTexObj = GL_TRUE;
}
}