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

Added a template get and get_exisiting method into osg::State that implements a new mechanism for managing OpenGL extensions.

Browse Source 
Refactored the BendFunc::Extensions usage to simplify it utilizing the new osg::State extension mechanism.


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14560 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-12-02 11:10:23 +00:00
parent b7067ad988
commit ff73445bf3
3 changed files with 45 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/osg/BlendFunc.cpp
View File

@@ -50,13 +50,8 @@ void BlendFunc::apply(State& state) const
if (_source_factor != _source_factor_alpha ||
_destination_factor != _destination_factor_alpha)
{
// get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context.
const unsigned int contextID = state.getContextID();
const Extensions* extensions = getExtensions(contextID,true);
if (!extensions->isBlendFuncSeparateSupported())
const Extensions* extensions = state.get<Extensions>();
if (!extensions->isBlendFuncSeparateSupported)
{
OSG_WARN<<"Warning: BlendFunc::apply(..) failed, BlendFuncSeparate is not support by OpenGL driver, falling back to BlendFunc."<<std::endl;
}
@@ -69,61 +64,3 @@ void BlendFunc::apply(State& state) const
glBlendFunc( _source_factor, _destination_factor );
}
typedef buffered_value< ref_ptr<BlendFunc::Extensions> > BufferedExtensions;
static BufferedExtensions s_extensions;
BlendFunc::Extensions* BlendFunc::getExtensions(unsigned int contextID,bool createIfNotInitalized)
{
if (!s_extensions[contextID] && createIfNotInitalized) s_extensions[contextID] = new Extensions(contextID);
return s_extensions[contextID].get();
}
void BlendFunc::setExtensions(unsigned int contextID,Extensions* extensions)
{
s_extensions[contextID] = extensions;
}
BlendFunc::Extensions::Extensions(unsigned int contextID)
{
setupGLExtensions(contextID);
}
BlendFunc::Extensions::Extensions(const Extensions& rhs):
Referenced()
{
_isBlendFuncSeparateSupported = rhs._isBlendFuncSeparateSupported;
_glBlendFuncSeparate = rhs._glBlendFuncSeparate;
}
void BlendFunc::Extensions::lowestCommonDenominator(const Extensions& rhs)
{
if (!rhs._isBlendFuncSeparateSupported) _isBlendFuncSeparateSupported = false;
if (!rhs._glBlendFuncSeparate) _glBlendFuncSeparate = 0;
}
void BlendFunc::Extensions::setupGLExtensions(unsigned int contextID)
{
_isBlendFuncSeparateSupported = OSG_GLES2_FEATURES || OSG_GL3_FEATURES ||
isGLExtensionSupported(contextID, "GL_EXT_blend_func_separate") ||
strncmp((const char*)glGetString(GL_VERSION), "1.4", 3) >= 0;
setGLExtensionFuncPtr(_glBlendFuncSeparate, "glBlendFuncSeparate", "glBlendFuncSeparateEXT");
}
void BlendFunc::Extensions::glBlendFuncSeparate(GLenum sfactorRGB,
GLenum dfactorRGB,
GLenum sfactorAlpha,
GLenum dfactorAlpha) const
{
if (_glBlendFuncSeparate)
{
_glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
}
else
{
OSG_WARN<<"Error: glBlendFuncSeparate not supported by OpenGL driver"<<std::endl;
}
}