Changeset 11126

Timestamp:

02/26/10 11:03:01 (3 years ago)

Author:

robert

Message:

From Paul Martz, "Summary: GL3 deprecates "glGetString(GL_EXTENSIONS)". In GL3, individual extension strings are queried by looping over GL_NUM_EXTENSIONS and calling "glGetStringi(GL_EXTENSIONS,<index>)".

The fix is basically as follows:

if( GL3 )

Query indexed extension strings.

else

Query the old way.

The "else" branch is re-indented but otherwise shouldn't contain any changes."

From Robert Osfield, added #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) to new block to prevent it
being compiled under GLES where no glGetStringi exists.

Files:

• OpenSceneGraph/trunk/src/osg/GLExtensions.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osg/GLExtensions.cpp

@@ -92 +92 @@
 
             // get the extension list from OpenGL.
+            #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
             if( osg::getGLVersionNumber() >= 3.0 )
             {
@@ -106 +107 @@
                 if( glGetStringi != NULL )
                 {
-    #  ifndef GL_NUM_EXTENSIONS
-    #    define GL_NUM_EXTENSIONS 0x821D
-    #  endif
+                    #  ifndef GL_NUM_EXTENSIONS
+                    #    define GL_NUM_EXTENSIONS 0x821D
+                    #  endif
                     GLint numExt;
                     glGetIntegerv( GL_NUM_EXTENSIONS, &numExt );
@@ -123 +124 @@
             }
             else
+            #endif
             {
                 // Get extensions using GL1/2 interface.