FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgUtil/GLObjectsVisitor.cpp
View File

@@ -46,7 +46,7 @@ void GLObjectsVisitor::apply(osg::Node& node)
if (programSetBefore && !programSetAfter)
{
osg::State* state = _renderInfo.getState();
osg::GL2Extensions* extensions = state->get<osg::GL2Extensions>();
osg::GLExtensions* extensions = state->get<osg::GLExtensions>();
extensions->glUseProgram(0);
state->setLastAppliedProgramObject(0);
_lastCompiledProgram = 0;
@@ -68,7 +68,7 @@ void GLObjectsVisitor::apply(osg::Geode& node)
if (!programSetBefore && programSetAfter)
{
osg::State* state = _renderInfo.getState();
osg::GL2Extensions* extensions = state->get<osg::GL2Extensions>();
osg::GLExtensions* extensions = state->get<osg::GLExtensions>();
extensions->glUseProgram(0);
state->setLastAppliedProgramObject(0);
_lastCompiledProgram = 0;
@@ -157,7 +157,7 @@ void GLObjectsVisitor::apply(osg::StateSet& stateset)
else if(_renderInfo.getState()->getLastAppliedProgramObject())
{
osg::State* state = _renderInfo.getState();
osg::GL2Extensions* extensions = state->get<osg::GL2Extensions>();
osg::GLExtensions* extensions = state->get<osg::GLExtensions>();
extensions->glUseProgram(0);
_renderInfo.getState()->setLastAppliedProgramObject(0);
}