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

Fixes for warnings

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14736 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-02-27 04:29:30 +00:00
parent 23b76599bd
commit d03b38dea8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgfpdepth/osgfpdepth.cpp
View File

@ -156,7 +156,7 @@ void getPossibleConfigs(GraphicsContext* gc, BufferConfigList& colorConfigs,
bool checkFramebufferStatus(GraphicsContext* gc, bool silent = false) bool checkFramebufferStatus(GraphicsContext* gc, bool silent = false)
{ {
State& state = *gc->getState(); State& state = *gc->getState();
osg::GLExtensions* ext = gc->getState()->get<GLExtensions>(); osg::GLExtensions* ext = state.get<GLExtensions>();
switch(ext->glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT)) { switch(ext->glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT)) {
case GL_FRAMEBUFFER_COMPLETE_EXT: case GL_FRAMEBUFFER_COMPLETE_EXT:
break; break;

4
src/osg/State.cpp
View File

@ -1847,14 +1847,14 @@ std::string State::getDefineString(const osg::ShaderDefines& shaderDefines)
const StateSet::DefinePair& dp = cd_itr->second; const StateSet::DefinePair& dp = cd_itr->second;
shaderDefineStr += "#define "; shaderDefineStr += "#define ";
shaderDefineStr += cd_itr->first; shaderDefineStr += cd_itr->first;
if (cd_itr->second.first.empty()) if (dp.first.empty())
{ {
shaderDefineStr += "\n"; shaderDefineStr += "\n";
} }
else else
{ {
shaderDefineStr += " "; shaderDefineStr += " ";
shaderDefineStr += cd_itr->second.first; shaderDefineStr += dp.first;
shaderDefineStr += "\n"; shaderDefineStr += "\n";
} }