Merge pull request #330 from mathieu/ProgramFixFunctionAvailableCoreProfile

osg::Program::isFixedFunction() should'nt return true if fixed function unavailable
This commit is contained in:
OpenSceneGraph git repository
2017-08-28 10:02:27 +01:00
committed by GitHub

View File

@@ -633,10 +633,14 @@ Program::PerContextProgram* Program::getPCP(State& state) const
bool Program::isFixedFunction() const
{
#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
// A Program object having no attached Shaders is a special case:
// it indicates that programmable shading is to be disabled,
// and thus use GL 1.x "fixed functionality" rendering.
return _shaderList.empty();
#else
return false;
#endif
}