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

From Mike Weiblen, Progra/Shader fixes

Browse Source
This commit is contained in:
Robert Osfield
2005-04-30 07:02:02 +00:00
parent 7d69b5e562
commit a5fcddc5e5
4 changed files with 801 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

804
src/osg/Program.cpp
View File

File diff suppressed because it is too large Load Diff

24
src/osg/Shader.cpp
View File

@@ -13,7 +13,7 @@
*/
/* file: src/osg/Shader.cpp
* author: Mike Weiblen 2005-04-07
* author: Mike Weiblen 2005-04-29
*/
#include <fstream>
@@ -232,10 +232,10 @@ void Shader::attachShader(unsigned int contextID, GLuint program) const
}
void Shader::getGlShaderInfoLog(unsigned int contextID, std::string& log) const
bool Shader::getGlShaderInfoLog(unsigned int contextID, std::string& log) const
{
PerContextShader* pcs = getPCS( contextID );
if( pcs ) pcs->getInfoLog( log );
return (pcs) ? pcs->getInfoLog( log ) : false;
}
@@ -324,17 +324,21 @@ void Shader::PerContextShader::compileShader()
_isCompiled = (compiled == GL_TRUE);
if( ! _isCompiled )
{
// compile failed
std::string infoLog;
getInfoLog( infoLog );
osg::notify(osg::WARN) << _shader->getTypename() <<
" glCompileShader FAILED:\n" << infoLog << std::endl;
osg::notify(osg::WARN) << _shader->getTypename() << " glCompileShader \""
<< _shader->getName() << "\" FAILED" << std::endl;
}
std::string infoLog;
if( getInfoLog(infoLog) )
{
osg::notify(osg::INFO) << _shader->getTypename() << " Shader \""
<< _shader->getName() << "\" infolog:\n" << infoLog << std::endl;
}
}
void Shader::PerContextShader::getInfoLog( std::string& infoLog ) const
bool Shader::PerContextShader::getInfoLog( std::string& infoLog ) const
{
_extensions->getShaderInfoLog( _glShaderHandle, infoLog );
return _extensions->getShaderInfoLog( _glShaderHandle, infoLog );
}
void Shader::PerContextShader::attachShader(GLuint program) const