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

Restructed check for whether to print out shaders to make it easier to toggle on/off

Browse Source
This commit is contained in:
Robert Osfield 2016-11-03 17:33:38 +00:00
parent 44c11a856b
commit 4600acb3b7
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/osg/Shader.cpp
View File

@ -628,12 +628,13 @@ void Shader::PerContextShader::compileShader(osg::State& state)
GLint compiled = GL_FALSE;
// OSG_NOTICE<<"Compiling PerContextShader "<<this<<" ShaderDefine="<<getDefineString()<<std::endl;
bool printOutShaders = osg::getNotifyLevel()>=osg::INFO;//NOTICE;
if (_defineStr.empty())
{
const GLchar* sourceText = reinterpret_cast<const GLchar*>(source.c_str());
if (osg::getNotifyLevel()>=osg::INFO)
if (printOutShaders)
{
std::string sourceToCompile;
if (!_defineStr.empty()) sourceToCompile += _defineStr;
@ -644,8 +645,6 @@ void Shader::PerContextShader::compileShader(osg::State& state)
<< " source:\n" << sourceWithLineNumbers << std::endl;
}
_extensions->glShaderSource( _glShaderHandle, 1, &sourceText, NULL );
}
else
@ -683,11 +682,11 @@ void Shader::PerContextShader::compileShader(osg::State& state)
if (!versionLine.empty())
{
if (osg::getNotifyLevel()>=osg::INFO)
if (printOutShaders)
{
std::string sourceWithLineNumbers = insertLineNumbers(versionLine + _defineStr + source);
OSG_INFO << "\nCompiling " << _shader->getTypename()
<< " source:\n" << sourceWithLineNumbers << std::endl;
OSG_NOTICE << "\nCompiling " << _shader->getTypename()
<< " source:\n" << sourceWithLineNumbers << std::endl;
}
// OSG_NOTICE<<"Shader::PerContextShader::compileShader() : Found #version, lineNum = "<<lineNum<<" ["<<versionLine<<"] new source = ["<<source<<"]"<<std::endl;
@ -700,11 +699,11 @@ void Shader::PerContextShader::compileShader(osg::State& state)
}
else
{
if (osg::getNotifyLevel()>=osg::INFO)
if (printOutShaders)
{
std::string sourceWithLineNumbers = insertLineNumbers(_defineStr + source);
OSG_INFO << "\nCompiling " << _shader->getTypename()
<< " source:\n" << sourceWithLineNumbers << std::endl;
OSG_NOTICE << "\nCompiling " << _shader->getTypename()
<< " source:\n" << sourceWithLineNumbers << std::endl;
}
const GLchar* sourceText[2];