Moved local Extensions structs into GL2Extensions

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14584 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-12-09 14:57:25 +00:00
parent 3f1e77d479
commit e31f682451
15 changed files with 110 additions and 518 deletions

View File

@@ -31,78 +31,17 @@ Multisample::~Multisample()
void Multisample::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->isMultisampleSupported())
const GL2Extensions* extensions = state.get<GL2Extensions>();
if (!extensions->isMultisampleSupported)
{
OSG_WARN<<"Warning: Multisample::apply(..) failed, Multisample is not support by OpenGL driver."<<std::endl;
return;
}
if(extensions->isMultisampleFilterHintSupported())
if(extensions->isMultisampleFilterHintSupported)
{
glHint(GL_MULTISAMPLE_FILTER_HINT_NV, _mode);
}
extensions->glSampleCoverage(_coverage, _invert);
}
typedef buffered_value< ref_ptr<Multisample::Extensions> > BufferedExtensions;
static BufferedExtensions s_extensions;
Multisample::Extensions* Multisample::getExtensions(unsigned int contextID,bool createIfNotInitalized)
{
if (!s_extensions[contextID] && createIfNotInitalized) s_extensions[contextID] = new Extensions(contextID);
return s_extensions[contextID].get();
}
void Multisample::setExtensions(unsigned int contextID,Extensions* extensions)
{
s_extensions[contextID] = extensions;
}
Multisample::Extensions::Extensions(unsigned int contextID)
{
setupGLExtensions(contextID);
}
Multisample::Extensions::Extensions(const Extensions& rhs):
Referenced()
{
_isMultisampleSupported = rhs._isMultisampleSupported;
_isMultisampleFilterHintSupported = rhs._isMultisampleFilterHintSupported;
}
void Multisample::Extensions::lowestCommonDenominator(const Extensions& rhs)
{
if (!rhs._isMultisampleSupported) _isMultisampleSupported = false;
if (!rhs._isMultisampleFilterHintSupported) _isMultisampleFilterHintSupported = false;
if (!rhs._glSampleCoverage) _glSampleCoverage = 0;
}
void Multisample::Extensions::setupGLExtensions(unsigned int contextID)
{
_isMultisampleSupported = OSG_GLES2_FEATURES || OSG_GL3_FEATURES || isGLExtensionSupported(contextID,"GL_ARB_multisample");
_isMultisampleFilterHintSupported = isGLExtensionSupported(contextID,"GL_NV_multisample_filter_hint");
setGLExtensionFuncPtr(_glSampleCoverage, "glSampleCoverageARB");
}
void Multisample::Extensions::glSampleCoverage(GLclampf value, GLboolean invert) const
{
if (_glSampleCoverage)
{
_glSampleCoverage(value, invert);
}
else
{
OSG_WARN<<"Error: glSampleCoverage not supported by OpenGL driver"<<std::endl;
}
}