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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/osg/BlendColor
View File

@ -20,7 +20,6 @@
#include <osg/Vec4>
namespace osg {
/** Encapsulates OpenGL blend/transparency state. */
@ -66,53 +65,6 @@ class OSG_EXPORT BlendColor : public StateAttribute
virtual void apply(State& state) const;
/** Encapsulates queries of extension availability, obtains extension
* function pointers, and provides convenience wrappers for
* calling extension functions. */
class OSG_EXPORT Extensions : public osg::Referenced
{
public:
Extensions(unsigned int contextID);
Extensions(const Extensions& rhs);
void lowestCommonDenominator(const Extensions& rhs);
void setupGLExtensions(unsigned int contextID);
void setBlendColorSupported(bool flag) { _isBlendColorSupported=flag; }
bool isBlendColorSupported() const { return _isBlendColorSupported; }
void glBlendColor(GLclampf red , GLclampf green , GLclampf blue , GLclampf alpha) const;
protected:
~Extensions() {}
typedef void (GL_APIENTRY * GLBlendColorProc) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
bool _isBlendColorSupported;
GLBlendColorProc _glBlendColor;
};
/** Returns the Extensions object for the given context.
* If createIfNotInitalized is true and the Extensions object doesn't
* exist, getExtensions() creates it on the given context.
* Returns NULL if createIfNotInitalized is false and the Extensions
* object doesn't exist. */
static Extensions* getExtensions(unsigned int contextID,bool createIfNotInitalized);
/** setExtensions() allows users to override the extensions across graphics contexts.
* Typically used when you have different extensions supported across graphics pipes,
* but need to ensure that they all use the same low common denominator extensions. */
static void setExtensions(unsigned int contextID,Extensions* extensions);
protected :
virtual ~BlendColor();

19
include/osg/BlendEquation
View File

@ -98,24 +98,7 @@ class OSG_EXPORT BlendEquation : public StateAttribute
virtual void apply(State& state) const;
/** Encapsulates queries of extension availability, obtains extension function pointers. */
struct OSG_EXPORT Extensions : public osg::Referenced
{
Extensions(unsigned int contextID);
bool isBlendEquationSupported;
bool isBlendEquationSeparateSupported;
bool isSGIXMinMaxSupported;
bool isLogicOpSupported;
void (GL_APIENTRY * glBlendEquation)(GLenum mode);
void (GL_APIENTRY * glBlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
void (GL_APIENTRY * glBlendEquationi)(GLuint buf, GLenum mode);
void (GL_APIENTRY * glBlendEquationSeparatei)(GLuint buf, GLenum modeRGB, GLenum modeAlpha);
};
protected :
protected :
virtual ~BlendEquation();

9
include/osg/Capability
View File

@ -103,15 +103,6 @@ class OSG_EXPORT Capabilityi : public osg::Capability
/** Get the renderbuffer index of the Enablei. */
unsigned int getIndex() const { return _index; }
/** Encapsulates queries of extension availability, obtains extension function pointers. */
struct OSG_EXPORT Extensions : public osg::Referenced
{
Extensions(unsigned int contextID);
void (GL_APIENTRY * glEnablei) (GLenum capability, GLuint buf);
void (GL_APIENTRY * glDisablei) (GLenum capability, GLuint buf);
};
protected:
virtual ~Capabilityi();

20
include/osg/GL2Extensions
View File

@ -598,7 +598,6 @@ class OSG_EXPORT GL2Extensions : public osg::Referenced
bool isRectangleSupported;
bool isCubeMapSupported;
void (GL_APIENTRY * glBlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
void (GL_APIENTRY * glDrawBuffers)(GLsizei n, const GLenum *bufs);
void (GL_APIENTRY * glStencilOpSeparate)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
void (GL_APIENTRY * glStencilFuncSeparate)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
@ -912,6 +911,25 @@ class OSG_EXPORT GL2Extensions : public osg::Referenced
GLint maxLayerCount;
GLint max2DSize;
// Blending
bool isBlendColorSupported;
bool isBlendEquationSupported;
bool isBlendEquationSeparateSupported;
bool isSGIXMinMaxSupported;
bool isLogicOpSupported;
void (GL_APIENTRY * glBlendColor) (GLclampf red , GLclampf green , GLclampf blue , GLclampf alpha);
void (GL_APIENTRY * glBlendEquation)(GLenum mode);
void (GL_APIENTRY * glBlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
void (GL_APIENTRY * glBlendEquationi)(GLuint buf, GLenum mode);
void (GL_APIENTRY * glBlendEquationSeparatei)(GLuint buf, GLenum modeRGB, GLenum modeAlpha);
// glEnablei/glDisabeli
void (GL_APIENTRY * glEnablei) (GLenum capability, GLuint buf);
void (GL_APIENTRY * glDisablei) (GLenum capability, GLuint buf);
};
}

72
src/osg/BlendColor.cpp
View File

@ -35,78 +35,12 @@ BlendColor::~BlendColor()
void BlendColor::apply(State& state) const
{
// 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->isBlendColorSupported())
const GL2Extensions* extensions = state.get<GL2Extensions>();
if (!extensions->isBlendColorSupported)
{
OSG_WARN<<"Warning: BlendColor::apply(..) failed, BlendColor is not support by OpenGL driver."<<std::endl;
return;
}
extensions->glBlendColor(_constantColor[0], _constantColor[1],
_constantColor[2], _constantColor[3]);
extensions->glBlendColor(_constantColor[0], _constantColor[1], _constantColor[2], _constantColor[3]);
}
typedef buffered_value< ref_ptr<BlendColor::Extensions> > BufferedExtensions;
static BufferedExtensions s_extensions;
BlendColor::Extensions* BlendColor::getExtensions(unsigned int contextID,bool createIfNotInitalized)
{
if (!s_extensions[contextID] && createIfNotInitalized) s_extensions[contextID] = new Extensions(contextID);
return s_extensions[contextID].get();
}
void BlendColor::setExtensions(unsigned int contextID,Extensions* extensions)
{
s_extensions[contextID] = extensions;
}
BlendColor::Extensions::Extensions(unsigned int contextID)
{
setupGLExtensions(contextID);
}
BlendColor::Extensions::Extensions(const Extensions& rhs):
Referenced()
{
_isBlendColorSupported = rhs._isBlendColorSupported;
_glBlendColor = rhs._glBlendColor;
}
void BlendColor::Extensions::lowestCommonDenominator(const Extensions& rhs)
{
if (!rhs._isBlendColorSupported) _isBlendColorSupported = false;
if (!rhs._glBlendColor) _glBlendColor = 0;
}
void BlendColor::Extensions::setupGLExtensions(unsigned int contextID)
{
_isBlendColorSupported = OSG_GLES2_FEATURES || OSG_GL3_FEATURES ||
isGLExtensionSupported(contextID,"GL_EXT_blend_color") ||
strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0;
setGLExtensionFuncPtr(_glBlendColor, "glBlendColor", "glBlendColorEXT");
}
void BlendColor::Extensions::glBlendColor(GLclampf red , GLclampf green , GLclampf blue , GLclampf alpha) const
{
if (_glBlendColor)
{
_glBlendColor(red, green, blue, alpha);
}
else
{
OSG_WARN<<"Error: glBlendColor not supported by OpenGL driver"<<std::endl;
}
}

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)
{

2
src/osg/BlendEquationi.cpp
View File

@ -28,7 +28,7 @@ BlendEquationi::~BlendEquationi()
void BlendEquationi::apply(State& state) const
{
const Extensions* extensions = state.get<Extensions>();
const GL2Extensions* extensions = state.get<GL2Extensions>();
if (_equationRGB == _equationAlpha)
{
if (extensions->glBlendEquationi)

11
src/osg/Capability.cpp
View File

@ -27,13 +27,6 @@ Capability::~Capability()
{
}
Capabilityi::Extensions::Extensions(unsigned int contextID)
{
setGLExtensionFuncPtr(glEnablei, "glEnablei");
setGLExtensionFuncPtr(glDisablei, "glDisablei");
}
Capabilityi::Capabilityi():
_index(0)
{
@ -45,7 +38,7 @@ Capabilityi::~Capabilityi()
void Enablei::apply(State& state) const
{
const Extensions* extensions = state.get<Extensions>();
const GL2Extensions* extensions = state.get<GL2Extensions>();
if (extensions->glEnablei)
{
OSG_NOTICE<<"extensions->glEnablei("<<_capability<<", "<<_index<<")"<<std::endl;
@ -59,7 +52,7 @@ void Enablei::apply(State& state) const
void Disablei::apply(State& state) const
{
const Extensions* extensions = state.get<Extensions>();
const GL2Extensions* extensions = state.get<GL2Extensions>();
if (extensions->glDisablei)
{
OSG_NOTICE<<"extensions->glDisablei("<<_capability<<", "<<_index<<")"<<std::endl;

31
src/osg/GL2Extensions.cpp
View File

@ -115,7 +115,6 @@ GL2Extensions::GL2Extensions(unsigned int contextID)
<< std::endl;
setGLExtensionFuncPtr(glBlendEquationSeparate, "glBlendEquationSeparate");
setGLExtensionFuncPtr(glDrawBuffers, "glDrawBuffers", "glDrawBuffersARB");
setGLExtensionFuncPtr(glStencilOpSeparate, "glStencilOpSeparate");
setGLExtensionFuncPtr(glStencilFuncSeparate, "glStencilFuncSeparate");
@ -525,6 +524,36 @@ GL2Extensions::GL2Extensions(unsigned int contextID)
maxLayerCount = 0;
glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, &maxLayerCount);
// Blending
isBlendColorSupported = OSG_GLES2_FEATURES || OSG_GL3_FEATURES ||
isGLExtensionSupported(contextID,"GL_EXT_blend_color") ||
strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0;
setGLExtensionFuncPtr(glBlendColor, "glBlendColor", "glBlendColorEXT");
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");
// glEnablei/glDisabli
setGLExtensionFuncPtr(glEnablei, "glEnablei");
setGLExtensionFuncPtr(glDisablei, "glDisablei");
}