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

8
src/osg/GL2Extensions.cpp
View File

@@ -2158,7 +2158,7 @@ bool GL2Extensions::getProgramInfoLog( GLuint program, std::string& result ) con
{
GLchar* infoLog = new GLchar[bufLen];
glGetProgramInfoLog( program, bufLen, &strLen, infoLog );
if( strLen > 0 ) result = infoLog;
if( strLen > 0 ) result = reinterpret_cast<char*>(infoLog);
delete [] infoLog;
}
return (strLen > 0);
@@ -2175,7 +2175,7 @@ bool GL2Extensions::getShaderInfoLog( GLuint shader, std::string& result ) const
{
GLchar* infoLog = new GLchar[bufLen];
glGetShaderInfoLog( shader, bufLen, &strLen, infoLog );
if( strLen > 0 ) result = infoLog;
if( strLen > 0 ) result = reinterpret_cast<char*>(infoLog);
delete [] infoLog;
}
return (strLen > 0);
@@ -2194,7 +2194,7 @@ bool GL2Extensions::getAttribLocation( const char* attribName, GLuint& location
if( linked == GL_FALSE ) return false;
// is there such a named attribute?
GLint loc = glGetAttribLocation( program, attribName );
GLint loc = glGetAttribLocation( program, reinterpret_cast<const GLchar*>(attribName) );
if( loc < 0 ) return false;
location = loc;
@@ -2217,7 +2217,7 @@ bool GL2Extensions::getFragDataLocation( const char* fragDataName, GLuint& locat
if (_glGetFragDataLocation == NULL) return false;
// is there such a named attribute?
GLint loc = glGetFragDataLocation( program, fragDataName );
GLint loc = glGetFragDataLocation( program, reinterpret_cast<const GLchar*>(fragDataName) );
if( loc < 0 ) return false;
location = loc;