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

From Mike Weiblen, updates to GL Shadler Language support

Browse Source
This commit is contained in:
Robert Osfield
2005-04-08 13:10:44 +00:00
parent dd3db860a2
commit d31cd3dce6
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/osg/Shader.cpp
View File

@@ -13,7 +13,7 @@
*/
/* file: src/osg/Shader.cpp
* author: Mike Weiblen 2005-04-06
* author: Mike Weiblen 2005-04-07
*/
#include <fstream>
@@ -197,12 +197,19 @@ const char* Shader::getTypename() const
void Shader::compileShader( unsigned int contextID ) const
{
getPCS( contextID )->compileShader();
PerContextShader* pcs = getPCS( contextID );
if( pcs ) pcs->compileShader();
}
Shader::PerContextShader* Shader::getPCS(unsigned int contextID) const
{
if( getType() == UNDEFINED )
{
osg::notify(osg::WARN) << "Shader type is UNDEFINED" << std::endl;
return 0;
}
if( ! _pcsList[contextID].valid() )
{
_pcsList[contextID] = new PerContextShader( this, contextID );
@@ -213,13 +220,15 @@ Shader::PerContextShader* Shader::getPCS(unsigned int contextID) const
void Shader::attachShader(unsigned int contextID, GLuint program) const
{
getPCS( contextID )->attachShader( program );
PerContextShader* pcs = getPCS( contextID );
if( pcs ) pcs->attachShader( program );
}
void Shader::getGlShaderInfoLog(unsigned int contextID, std::string& log) const
{
getPCS( contextID )->getInfoLog( log );
PerContextShader* pcs = getPCS( contextID );
if( pcs ) pcs->getInfoLog( log );
}