Fixes for removal of FBOExtensions.

mccdo · Dec 11, 2015 · a90a986 · a90a986
1 parent 922f38e
commit a90a986
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/examples/msmrt/msmrt.cpp b/examples/msmrt/msmrt.cpp
@@ -50,7 +50,11 @@ class MSMRTCallback : public osg::Camera::DrawCallback
     {
         osg::State& state = *renderInfo.getState();
         const unsigned int ctx = state.getContextID();
+#if( OSGWORKS_OSG_VERSION >= OSG_FBO_CHANGE_2_VERSION )
+        osg::GLExtensions* fboExt = osg::GLExtensions::Get( ctx, true );
+#else
         osg::FBOExtensions* fboExt = osg::FBOExtensions::instance( ctx, true );
+#endif
 
         PerContextInfo& ctxInfo( _contextInfo[ ctx ] );
         if( ctxInfo.__glGetFramebufferAttachmentParameteriv == NULL )

diff --git a/include/osgwTools/FBOUtils.h b/include/osgwTools/FBOUtils.h
@@ -93,7 +93,7 @@ OSG versions.
 
 
 
-#if OSG_MIN_VERSION_REQUIRED( 3,3,3 )
+#if( OSGWORKS_OSG_VERSION >= OSG_FBO_CHANGE_2_VERSION )
 GLvoid OSGWTOOLS_EXPORT glGenFramebuffers( osg::GLExtensions* fboExt, GLsizei n, GLuint* framebuffer );
 GLvoid OSGWTOOLS_EXPORT glDeleteFramebuffers( osg::GLExtensions* fboExt, GLsizei n, GLuint* framebuffer );
 GLvoid OSGWTOOLS_EXPORT glBindFramebuffer( osg::GLExtensions* fboExt, GLenum target, GLuint framebuffer );

diff --git a/src/osgwTools/FBOUtils.cpp b/src/osgwTools/FBOUtils.cpp
@@ -27,10 +27,15 @@ namespace osgwTools
 {
 
 
+// Version in which OSG removed "EXT" off of FBO commands.
+// (E.g., "glGenFramebuffersEXT" became "glGenFramebuffers".
 #define OSG_FBO_CHANGE_VERSION 20906
+// Version in which OSG moved FBO commands from osg::FBOExtensions object
+// to osg::GLExtensions object, and removed FBOExtensions object altogether.
+#define OSG_FBO_CHANGE_2_VERSION 30303
 
 
-#if OSG_MIN_VERSION_REQUIRED(3,3,3)
+#if( OSGWORKS_OSG_VERSION >= OSG_FBO_CHANGE_2_VERSION )
 GLvoid glGenFramebuffers( osg::GLExtensions* fboExt, GLsizei n, GLuint* framebuffer )
 #else
 GLvoid glGenFramebuffers( osg::FBOExtensions* fboExt, GLsizei n, GLuint* framebuffer )
@@ -43,7 +48,7 @@ GLvoid glGenFramebuffers( osg::FBOExtensions* fboExt, GLsizei n, GLuint* framebu
 #endif
 }
 
-#if OSG_MIN_VERSION_REQUIRED(3,3,3)
+#if( OSGWORKS_OSG_VERSION >= OSG_FBO_CHANGE_2_VERSION )
 GLvoid glDeleteFramebuffers( osg::GLExtensions* fboExt, GLsizei n, GLuint* framebuffer )
 #else
 GLvoid glDeleteFramebuffers( osg::FBOExtensions* fboExt, GLsizei n, GLuint* framebuffer )
@@ -56,7 +61,7 @@ GLvoid glDeleteFramebuffers( osg::FBOExtensions* fboExt, GLsizei n, GLuint* fram
 #endif
 }
 
-#if OSG_MIN_VERSION_REQUIRED(3,3,3)
+#if( OSGWORKS_OSG_VERSION >= OSG_FBO_CHANGE_2_VERSION )
 GLvoid glBindFramebuffer( osg::GLExtensions* fboExt, GLenum target, GLuint framebuffer )
 #else
 GLvoid glBindFramebuffer( osg::FBOExtensions* fboExt, GLenum target, GLuint framebuffer )
@@ -70,7 +75,7 @@ GLvoid glBindFramebuffer( osg::FBOExtensions* fboExt, GLenum target, GLuint fram
 }
 
 
-#if OSG_MIN_VERSION_REQUIRED(3,3,3)
+#if( OSGWORKS_OSG_VERSION >= OSG_FBO_CHANGE_2_VERSION )
 GLvoid glFramebufferTexture2D( osg::GLExtensions* fboExt, GLenum target, GLenum attachment,
             GLenum textarget, GLuint texture, GLint level )
 #else
@@ -85,7 +90,7 @@ GLvoid glFramebufferTexture2D( osg::FBOExtensions* fboExt, GLenum target, GLenum
 #endif
 }
 
-#if OSG_MIN_VERSION_REQUIRED(3,3,3)
+#if( OSGWORKS_OSG_VERSION >= OSG_FBO_CHANGE_2_VERSION )
 GLvoid glBlitFramebuffer( osg::GLExtensions* fboExt, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
             GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter )
 #else