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

From Chris Hanson, build fixes for Solaris-64

Browse Source
This commit is contained in:
Robert Osfield
2010-04-15 11:41:37 +00:00
parent 72e6867679
commit 7db9f18619
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osg/Program.cpp
View File

@@ -490,7 +490,7 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
itr != programBindlist.end(); ++itr )
{
osg::notify(osg::NOTICE)<<"Program's vertex attrib binding "<<itr->second<<", "<<itr->first<<std::endl;
_extensions->glBindAttribLocation( _glProgramHandle, itr->second, itr->first.c_str() );
_extensions->glBindAttribLocation( _glProgramHandle, itr->second, reinterpret_cast<const GLchar*>(itr->first.c_str()) );
}
// set any explicit vertex attribute bindings that are set up via osg::State, such as the vertex arrays
@@ -502,7 +502,7 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
itr != stateBindlist.end(); ++itr )
{
osg::notify(osg::NOTICE)<<"State's vertex attrib binding "<<itr->second<<", "<<itr->first<<std::endl;
_extensions->glBindAttribLocation( _glProgramHandle, itr->second, itr->first.c_str() );
_extensions->glBindAttribLocation( _glProgramHandle, itr->second, reinterpret_cast<const GLchar*>(itr->first.c_str()) );
}
}
@@ -511,7 +511,7 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
for( FragDataBindingList::const_iterator itr = fdbindlist.begin();
itr != fdbindlist.end(); ++itr )
{
_extensions->glBindFragDataLocation( _glProgramHandle, itr->second, itr->first.c_str() );
_extensions->glBindFragDataLocation( _glProgramHandle, itr->second, reinterpret_cast<const GLchar*>(itr->first.c_str()) );
}
// link the glProgram
@@ -562,7 +562,7 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
if( loc != -1 )
{
_uniformInfoMap[name] = ActiveVarInfo(loc,type,size);
_uniformInfoMap[reinterpret_cast<char*>(name)] = ActiveVarInfo(loc,type,size);
osg::notify(osg::INFO)
<< "\tUniform \"" << name << "\""
@@ -594,7 +594,7 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
if( loc != -1 )
{
_attribInfoMap[name] = ActiveVarInfo(loc,type,size);
_attribInfoMap[reinterpret_cast<char*>(name)] = ActiveVarInfo(loc,type,size);
osg::notify(osg::INFO)
<< "\tAttrib \"" << name << "\""