Moved the infolog to the error handling block and upping its notification
level to WARN to provide better feedback on failure with needing to use DEBUG notification level.
This commit is contained in:
parent
5e0a5b39e0
commit
d681d47c72
@ -2168,18 +2168,17 @@ void Program::PerContextProgram::linkProgram()
|
|||||||
{
|
{
|
||||||
osg::notify(osg::WARN) << "glLinkProgram \""
|
osg::notify(osg::WARN) << "glLinkProgram \""
|
||||||
<< _program->getName() << "\" FAILED" << std::endl;
|
<< _program->getName() << "\" FAILED" << std::endl;
|
||||||
}
|
|
||||||
|
|
||||||
std::string infoLog;
|
std::string infoLog;
|
||||||
if( getInfoLog(infoLog) )
|
if( getInfoLog(infoLog) )
|
||||||
{
|
{
|
||||||
osg::notify(osg::INFO) << "Program \""
|
osg::notify(osg::WARN) << "Program \""
|
||||||
<< _program->getName() << "\" infolog:\n" << infoLog << std::endl;
|
<< _program->getName() << "\" infolog:\n" << infoLog << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// dont build maps if link failed
|
|
||||||
if( ! _isLinked ) return;
|
|
||||||
|
|
||||||
// build _uniformInfoMap
|
// build _uniformInfoMap
|
||||||
GLint numUniforms = 0;
|
GLint numUniforms = 0;
|
||||||
GLsizei maxLen = 0;
|
GLsizei maxLen = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user