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

Fixed linking bug caused by repeated Program::addShader()/removeShader() operations invalidating the internal attach/dettech lists.

Browse Source
This commit is contained in:
Robert Osfield
2017-01-24 17:36:36 +00:00
parent d1e162a61f
commit 23da167c27
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/osg/Program.cpp
View File

@@ -732,26 +732,42 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
if (!_loadedBinary)
{
// Detach removed shaders
for( unsigned int i=0; i < _shadersToDetach.size(); ++i )
const GLsizei shaderMaxCount = 20;
GLsizei shadersCount;
GLuint shaderObjectHandle[shaderMaxCount];
_extensions->glGetAttachedShaders(_glProgramHandle, shaderMaxCount, &shadersCount, shaderObjectHandle);
typedef std::map<GLuint, int> ShaderSet;
ShaderSet shadersRequired;
for(GLsizei i=0; i<shadersCount; ++i)
{
Shader::PerContextShader* pcs = _shadersToDetach[i]->getPCS(state);
if (pcs) _extensions->glDetachShader( _glProgramHandle, pcs->getHandle() );
shadersRequired[shaderObjectHandle[i]]--;
}
for(unsigned int i=0; i < getProgram()->getNumShaders(); ++i)
{
const Shader* shader = getProgram()->getShader( i );
Shader::PerContextShader* pcs = shader->getPCS(state);
if (pcs) shadersRequired[ pcs->getHandle() ]++;
}
for(ShaderSet::iterator itr = shadersRequired.begin();
itr != shadersRequired.end();
++itr)
{
if (itr->second>0)
{
_extensions->glAttachShader( _glProgramHandle, itr->first );
}
else if (itr->second<0)
{
_extensions->glDetachShader( _glProgramHandle, itr->first );
}
}
}
_shadersToDetach.clear();
if (!_loadedBinary)
{
// Attach new shaders
for( unsigned int i=0; i < _shadersToAttach.size(); ++i )
{
Shader::PerContextShader* pcs = _shadersToAttach[i]->getPCS(state);
if (pcs) _extensions->glAttachShader( _glProgramHandle, pcs->getHandle() );
}
}
//state.checkGLErrors("After attaching shaders.");
_shadersToAttach.clear();
_uniformInfoMap.clear();
@@ -805,12 +821,12 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
if( ! _isLinked )
{
OSG_WARN << "glLinkProgram \""<< _program->getName() << "\" FAILED" << std::endl;
OSG_NOTICE << "glLinkProgram "<<this<<"\""<< _program->getName() << "\" FAILED" << std::endl;
std::string infoLog;
if( getInfoLog(infoLog) )
{
OSG_WARN << "Program \""<< _program->getName() << "\" "
OSG_NOTICE << "Program \""<< _program->getName() << "\" "
"infolog:\n" << infoLog << std::endl;
}