Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

Moved the #defines into new include/osg/GLDefines
Converted all GL2Extensions usage to GLExtensions usage


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14593 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-12-10 10:38:12 +00:00
parent 09205544b7
commit 485709f708
66 changed files with 1355 additions and 155 deletions

View File

@@ -86,7 +86,7 @@ public:
// check if we need to do some depth buffer copying from a source FBO into the current FBO
if (_source_fbo.get() != NULL)
{
osg::GL2Extensions* ext = renderInfo.getState()->get<osg::GL2Extensions>();
osg::GLExtensions* ext = renderInfo.getState()->get<osg::GLExtensions>();
bool fbo_supported = ext && ext->isFrameBufferObjectSupported;
if (fbo_supported && ext->glBlitFramebuffer)
{
@@ -131,7 +131,7 @@ public:
// only unbind the fbo if this is the last transparency pass
if (_restore)
{
renderInfo.getState()->get<osg::GL2Extensions>()->glBindFramebuffer( GL_FRAMEBUFFER_EXT, 0 );
renderInfo.getState()->get<osg::GLExtensions>()->glBindFramebuffer( GL_FRAMEBUFFER_EXT, 0 );
}
}
protected: