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

Moved osg::BlenFunc::Extensions into osg::GL2Extensions

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14571 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-12-04 19:03:16 +00:00
parent d02c0bdc49
commit d83e641fad
5 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osg/BlendFunc.cpp
View File

@@ -17,19 +17,6 @@
using namespace osg;
// Set up extensions
BlendFunc::Extensions::Extensions(unsigned int contextID)
{
isBlendFuncSeparateSupported = OSG_GLES2_FEATURES || OSG_GL3_FEATURES ||
osg::isGLExtensionSupported(contextID, "GL_EXT_blend_func_separate") ||
strncmp((const char*)glGetString(GL_VERSION), "1.4", 3) >= 0;
setGLExtensionFuncPtr(glBlendFuncSeparate, "glBlendFuncSeparate", "glBlendFuncSeparateEXT");
setGLExtensionFuncPtr(glBlendFunci, "glBlendFunci", "glBlendFunciARB");
setGLExtensionFuncPtr(glBlendFuncSeparatei, "glBlendFuncSeparatei", "glBlendFuncSeparateiARB");
}
BlendFunc::BlendFunc():
_source_factor(SRC_ALPHA),
_destination_factor(ONE_MINUS_SRC_ALPHA),
@@ -63,7 +50,7 @@ void BlendFunc::apply(State& state) const
if (_source_factor != _source_factor_alpha ||
_destination_factor != _destination_factor_alpha)
{
const Extensions* extensions = state.get<Extensions>();
const GL2Extensions* extensions = state.get<GL2Extensions>();
if (!extensions->isBlendFuncSeparateSupported)
{
OSG_WARN<<"Warning: BlendFunc::apply(..) failed, BlendFuncSeparate is not support by OpenGL driver, falling back to BlendFunc."<<std::endl;