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

Added disabling of modes that aren't supported with GLES2

Browse Source
This commit is contained in:
Robert Osfield
2009-11-10 11:28:21 +00:00
parent d515b69d88
commit 126f83e5b4
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/osgUtil/ShaderGen.cpp
View File

@@ -349,8 +349,10 @@ void ShaderGenVisitor::update(osg::Drawable *drawable)
{ {
// update only geometry due to compatibility issues with user defined drawables // update only geometry due to compatibility issues with user defined drawables
osg::Geometry *geometry = drawable->asGeometry(); osg::Geometry *geometry = drawable->asGeometry();
#if 0
if (!geometry) if (!geometry)
return; return;
#endif
StateEx *state = static_cast<StateEx *>(_state.get()); StateEx *state = static_cast<StateEx *>(_state.get());
// skip nodes without state sets // skip nodes without state sets
@@ -370,7 +372,8 @@ void ShaderGenVisitor::update(osg::Drawable *drawable)
stateMask |= ShaderGenCache::FOG; stateMask |= ShaderGenCache::FOG;
if (state->getTextureAttribute(0, osg::StateAttribute::TEXTURE)) if (state->getTextureAttribute(0, osg::StateAttribute::TEXTURE))
stateMask |= ShaderGenCache::DIFFUSE_MAP; stateMask |= ShaderGenCache::DIFFUSE_MAP;
if (state->getTextureAttribute(1, osg::StateAttribute::TEXTURE) &&
if (state->getTextureAttribute(1, osg::StateAttribute::TEXTURE) && geometry!=0 &&
geometry->getVertexAttribArray(6)) //tangent geometry->getVertexAttribArray(6)) //tangent
stateMask |= ShaderGenCache::NORMAL_MAP; stateMask |= ShaderGenCache::NORMAL_MAP;
@@ -381,4 +384,16 @@ void ShaderGenVisitor::update(osg::Drawable *drawable)
ss->setAttribute(progss->getAttribute(osg::StateAttribute::PROGRAM)); ss->setAttribute(progss->getAttribute(osg::StateAttribute::PROGRAM));
ss->setUniformList(progss->getUniformList()); ss->setUniformList(progss->getUniformList());
// remove any modes that won't be appropriate when using shaders
if ((stateMask&ShaderGenCache::LIGHTING)!=0)
{
ss->removeMode(GL_LIGHTING);
ss->removeMode(GL_LIGHT0);
}
if ((stateMask&ShaderGenCache::FOG)!=0)
{
ss->removeMode(GL_FOG);
}
if ((stateMask&ShaderGenCache::DIFFUSE_MAP)!=0) ss->removeTextureMode(0, GL_TEXTURE_2D);
if ((stateMask&ShaderGenCache::NORMAL_MAP)!=0) ss->removeTextureMode(1, GL_TEXTURE_2D);
} }