From d681d47c72b6bcdad86e508a324a58a7d17d6e28 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 10 May 2005 18:21:31 +0000 Subject: [PATCH] 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. --- src/osg/Program.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/osg/Program.cpp b/src/osg/Program.cpp index ed59d9510..a5d1d935c 100644 --- a/src/osg/Program.cpp +++ b/src/osg/Program.cpp @@ -2168,18 +2168,17 @@ void Program::PerContextProgram::linkProgram() { osg::notify(osg::WARN) << "glLinkProgram \"" << _program->getName() << "\" FAILED" << std::endl; - } - std::string infoLog; - if( getInfoLog(infoLog) ) - { - osg::notify(osg::INFO) << "Program \"" - << _program->getName() << "\" infolog:\n" << infoLog << std::endl; + std::string infoLog; + if( getInfoLog(infoLog) ) + { + osg::notify(osg::WARN) << "Program \"" + << _program->getName() << "\" infolog:\n" << infoLog << std::endl; + } + + return; } - // dont build maps if link failed - if( ! _isLinked ) return; - // build _uniformInfoMap GLint numUniforms = 0; GLsizei maxLen = 0;