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

Fixed shadows warnings

Browse Source
This commit is contained in:
Robert Osfield 2016-05-23 10:22:16 +01:00
parent ae3ba28fee
commit 776fa48cd4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/GLExtensions.cpp
View File

@ -122,8 +122,8 @@ bool osg::isGLExtensionOrVersionSupported(unsigned int contextID, const char *ex
// Get extensions using new indexed string interface.
typedef const GLubyte * GL_APIENTRY PFNGLGETSTRINGIPROC( GLenum, GLuint );
PFNGLGETSTRINGIPROC* glGetStringi = 0;
typedef const GLubyte * GL_APIENTRY MYGLGETSTRINGIPROC( GLenum, GLuint );
MYGLGETSTRINGIPROC* glGetStringi = 0;
setGLExtensionFuncPtr( glGetStringi, "glGetStringi");
if( glGetStringi != NULL )

12
src/osg/ShaderComposer.cpp
View File

@ -56,11 +56,11 @@ void ShaderComposer::releaseGLObjects(osg::State* state) const
osg::Program* ShaderComposer::getOrCreateProgram(const ShaderComponents& shaderComponents)
{
ProgramMap::iterator itr = _programMap.find(shaderComponents);
if (itr != _programMap.end())
ProgramMap::iterator pmitr = _programMap.find(shaderComponents);
if (pmitr != _programMap.end())
{
// OSG_NOTICE<<"ShaderComposer::getOrCreateProgram(..) using cached Program"<<std::endl;
return itr->second.get();
return pmitr->second.get();
}
// strip out vertex shaders
@ -151,8 +151,8 @@ osg::Program* ShaderComposer::getOrCreateProgram(const ShaderComponents& shaderC
void ShaderComposer::addShaderToProgram(Program* program, const Shaders& shaders)
{
ShaderMainMap::iterator itr = _shaderMainMap.find(shaders);
if (itr == _shaderMainMap.end())
ShaderMainMap::iterator smitr = _shaderMainMap.find(shaders);
if (smitr == _shaderMainMap.end())
{
// no vertex shader in map yet, need to compose a new main shader
osg::Shader* mainShader = composeMain(shaders);
@ -161,7 +161,7 @@ void ShaderComposer::addShaderToProgram(Program* program, const Shaders& shaders
}
else
{
program->addShader(itr->second.get());
program->addShader(smitr->second.get());
}
for(Shaders::const_iterator itr = shaders.begin();