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

Moved local Extensions objects to GL2Extensions

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14582 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-12-09 10:37:09 +00:00
parent cceee38727
commit ec4f898bce
9 changed files with 57 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/osg/BlendEquation.cpp
View File

@@ -19,32 +19,6 @@
using namespace osg;
// Set up extensions
BlendEquation::Extensions::Extensions(unsigned int contextID)
{
bool bultInSupport = OSG_GLES2_FEATURES || OSG_GL3_FEATURES;
isBlendEquationSupported = bultInSupport ||
isGLExtensionSupported(contextID, "GL_EXT_blend_equation") ||
strncmp((const char*)glGetString(GL_VERSION), "1.2", 3) >= 0;
isBlendEquationSeparateSupported = bultInSupport ||
isGLExtensionSupported(contextID, "GL_EXT_blend_equation_separate") ||
strncmp((const char*)glGetString(GL_VERSION), "2.0", 3) >= 0;
isSGIXMinMaxSupported = isGLExtensionSupported(contextID, "GL_SGIX_blend_alpha_minmax");
isLogicOpSupported = isGLExtensionSupported(contextID, "GL_EXT_blend_logic_op");
setGLExtensionFuncPtr(glBlendEquation, "glBlendEquation", "glBlendEquationEXT");
setGLExtensionFuncPtr(glBlendEquationSeparate, "glBlendEquationSeparate", "glBlendEquationSeparateEXT");
setGLExtensionFuncPtr(glBlendEquationi, "glBlendEquationi", "glBlendEquationiARB");
setGLExtensionFuncPtr(glBlendEquationSeparatei, "glBlendEquationSeparatei", "glBlendEquationSeparateiARB");
}
BlendEquation::BlendEquation():
_equationRGB(FUNC_ADD),
_equationAlpha(FUNC_ADD)
@@ -69,7 +43,7 @@ BlendEquation::~BlendEquation()
void BlendEquation::apply(State& state) const
{
const Extensions* extensions = state.get<Extensions>();
const GL2Extensions* extensions = state.get<GL2Extensions>();
if (!extensions->isBlendEquationSupported)
{