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

Improved handling of clean up of osg::Program/osg::Shader on closing of a graphis context.

Browse Source
This commit is contained in:
Robert Osfield
2006-01-16 17:05:17 +00:00
parent 0c9ab51e09
commit 93a2c3d011
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osg/Program.cpp
View File

@@ -1999,9 +1999,19 @@ void Program::dirtyProgram()
}
void Program::releaseGLObjects(osg::State* /*state*/) const
void Program::releaseGLObjects(osg::State* state) const
{
// TODO
for( unsigned int i=0; i < _shaderList.size(); ++i )
{
if (_shaderList[i].valid()) _shaderList[i]->releaseGLObjects(state);
}
if (!state) _pcpList.setAllElementsTo(0);
else
{
unsigned int contextID = state->getContextID();
_pcpList[contextID] = 0;
}
}
@@ -2274,13 +2284,13 @@ void Program::PerContextProgram::linkProgram()
osg::notify(osg::INFO) << std::endl;
}
void Program::PerContextProgram::validateProgram()
bool Program::PerContextProgram::validateProgram()
{
GLint validated = GL_FALSE;
_extensions->glValidateProgram( _glProgramHandle );
_extensions->glGetProgramiv( _glProgramHandle, GL_VALIDATE_STATUS, &validated );
if( validated == GL_TRUE)
return;
return true;
osg::notify(osg::INFO)
<< "glValidateProgram FAILED \"" << _program->getName() << "\""
@@ -2293,6 +2303,8 @@ void Program::PerContextProgram::validateProgram()
osg::notify(osg::INFO) << "infolog:\n" << infoLog << std::endl;
osg::notify(osg::INFO) << std::endl;
return false;
}
bool Program::PerContextProgram::getInfoLog( std::string& infoLog ) const