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

From Paul Melis, "Here is a list of fixes to misspelled APIs. Unfortunately, more than one

Browse Source 
of these are public APIs and therefore will break linkage to existing
shared libraries."

Note from Robert Osfield, updated wrappers.
This commit is contained in:
Robert Osfield
2007-06-27 20:36:16 +00:00
parent 64b8e3062f
commit eac3dc1963
58 changed files with 124 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/BlendColor.cpp
View File

@@ -72,7 +72,7 @@ void BlendColor::setExtensions(unsigned int contextID,Extensions* extensions)
BlendColor::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
BlendColor::Extensions::Extensions(const Extensions& rhs):
@@ -87,7 +87,7 @@ void BlendColor::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glBlendColor) _glBlendColor = 0;
}
void BlendColor::Extensions::setupGLExtenions(unsigned int contextID)
void BlendColor::Extensions::setupGLExtensions(unsigned int contextID)
{
_isBlendColorSupported = isGLExtensionSupported(contextID,"GL_EXT_blend_color") ||
strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0;

4
src/osg/BlendEquation.cpp
View File

@@ -85,7 +85,7 @@ void BlendEquation::setExtensions(unsigned int contextID,Extensions* extensions)
BlendEquation::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
BlendEquation::Extensions::Extensions(const Extensions& rhs):
@@ -103,7 +103,7 @@ void BlendEquation::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glBlendEquation) _glBlendEquation = 0;
}
void BlendEquation::Extensions::setupGLExtenions(unsigned int contextID)
void BlendEquation::Extensions::setupGLExtensions(unsigned int contextID)
{
_isBlendEquationSupported = isGLExtensionSupported(contextID,"GL_EXT_blend_equation") ||
strncmp((const char*)glGetString(GL_VERSION),"1.2",3)>=0;

4
src/osg/BufferObject.cpp
View File

@@ -154,7 +154,7 @@ void BufferObject::setExtensions(unsigned int contextID,Extensions* extensions)
BufferObject::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
BufferObject::Extensions::Extensions(const Extensions& rhs):
@@ -189,7 +189,7 @@ void BufferObject::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glGetBufferParameteriv) _glGetBufferPointerv = rhs._glGetBufferPointerv;
}
void BufferObject::Extensions::setupGLExtenions(unsigned int contextID)
void BufferObject::Extensions::setupGLExtensions(unsigned int contextID)
{
_glGenBuffers = ((GenBuffersProc)osg::getGLExtensionFuncPtr("glGenBuffers","glGenBuffersARB"));
_glBindBuffer = ((BindBufferProc)osg::getGLExtensionFuncPtr("glBindBuffer","glBindBufferARB"));

4
src/osg/ClampColor.cpp
View File

@@ -75,7 +75,7 @@ void ClampColor::setExtensions(unsigned int contextID,Extensions* extensions)
ClampColor::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
ClampColor::Extensions::Extensions(const Extensions& rhs):
@@ -91,7 +91,7 @@ void ClampColor::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glClampColor) _glClampColor = 0;
}
void ClampColor::Extensions::setupGLExtenions(unsigned int contextID)
void ClampColor::Extensions::setupGLExtensions(unsigned int contextID)
{
_isClampColorSupported = isGLExtensionSupported(contextID,"GL_ARB_color_buffer_float") ||
strncmp((const char*)glGetString(GL_VERSION),"2.0",3)>=0;

4
src/osg/Drawable.cpp
View File

@@ -819,7 +819,7 @@ void Drawable::setExtensions(unsigned int contextID,Extensions* extensions)
Drawable::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
Drawable::Extensions::Extensions(const Extensions& rhs):
@@ -928,7 +928,7 @@ void Drawable::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._gl_get_query_objectui64v) _gl_get_query_objectui64v = 0;
}
void Drawable::Extensions::setupGLExtenions(unsigned int contextID)
void Drawable::Extensions::setupGLExtensions(unsigned int contextID)
{
_isVertexProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_vertex_program");
_isSecondaryColorSupported = isGLExtensionSupported(contextID,"GL_EXT_secondary_color");

4
src/osg/FragmentProgram.cpp
View File

@@ -219,7 +219,7 @@ void FragmentProgram::setExtensions(unsigned int contextID,Extensions* extension
FragmentProgram::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
FragmentProgram::Extensions::Extensions(const Extensions& rhs):
@@ -246,7 +246,7 @@ void FragmentProgram::Extensions::lowestCommonDenominator(const Extensions& rhs)
}
void FragmentProgram::Extensions::setupGLExtenions(unsigned int contextID)
void FragmentProgram::Extensions::setupGLExtensions(unsigned int contextID)
{
_isFragmentProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_fragment_program");

4
src/osg/Multisample.cpp
View File

@@ -69,7 +69,7 @@ void Multisample::setExtensions(unsigned int contextID,Extensions* extensions)
Multisample::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
Multisample::Extensions::Extensions(const Extensions& rhs):
@@ -86,7 +86,7 @@ void Multisample::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glSampleCoverage) _glSampleCoverage = 0;
}
void Multisample::Extensions::setupGLExtenions(unsigned int contextID)
void Multisample::Extensions::setupGLExtensions(unsigned int contextID)
{
_isMultisampleSupported = isGLExtensionSupported(contextID,"GL_ARB_multisample");
_isMultisampleFilterHintSupported = isGLExtensionSupported(contextID,"GL_NV_multisample_filter_hint");

4
src/osg/Point.cpp
View File

@@ -104,7 +104,7 @@ void Point::setExtensions(unsigned int contextID,Extensions* extensions)
Point::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
Point::Extensions::Extensions(const Extensions& rhs):
@@ -121,7 +121,7 @@ void Point::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glPointParameterfv) _glPointParameterfv = 0;
}
void Point::Extensions::setupGLExtenions(unsigned int contextID)
void Point::Extensions::setupGLExtensions(unsigned int contextID)
{
_isPointParametersSupported = strncmp((const char*)glGetString(GL_VERSION),"1.4",3)>=0 ||
isGLExtensionSupported(contextID,"GL_ARB_point_parameters") ||

2
src/osg/Referenced.cpp
View File

@@ -223,7 +223,7 @@ void Referenced::removeObserver(Observer* observer)
}
}
void Referenced::deletUsingDeleteHandler() const
void Referenced::deleteUsingDeleteHandler() const
{
getDeleteHandler()->requestDelete(this);
}

4
src/osg/StencilTwoSided.cpp
View File

@@ -119,7 +119,7 @@ void StencilTwoSided::setExtensions(unsigned int contextID,Extensions* extension
StencilTwoSided::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
StencilTwoSided::Extensions::Extensions(const Extensions& rhs):
@@ -138,7 +138,7 @@ void StencilTwoSided::Extensions::lowestCommonDenominator(const Extensions& rhs)
}
void StencilTwoSided::Extensions::setupGLExtenions(unsigned int contextID)
void StencilTwoSided::Extensions::setupGLExtensions(unsigned int contextID)
{
_isStencilTwoSidedSupported = isGLExtensionSupported(contextID,"GL_EXT_stencil_two_side");

4
src/osg/TextureCubeMap.cpp
View File

@@ -379,7 +379,7 @@ void TextureCubeMap::setExtensions(unsigned int contextID,Extensions* extensions
TextureCubeMap::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
TextureCubeMap::Extensions::Extensions(const Extensions& rhs):
@@ -393,7 +393,7 @@ void TextureCubeMap::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._isCubeMapSupported) _isCubeMapSupported = false;
}
void TextureCubeMap::Extensions::setupGLExtenions(unsigned int contextID)
void TextureCubeMap::Extensions::setupGLExtensions(unsigned int contextID)
{
_isCubeMapSupported = isGLExtensionSupported(contextID,"GL_ARB_texture_cube_map") ||
isGLExtensionSupported(contextID,"GL_EXT_texture_cube_map") ||

4
src/osg/VertexProgram.cpp
View File

@@ -219,7 +219,7 @@ void VertexProgram::setExtensions(unsigned int contextID,Extensions* extensions)
VertexProgram::Extensions::Extensions(unsigned int contextID)
{
setupGLExtenions(contextID);
setupGLExtensions(contextID);
}
VertexProgram::Extensions::Extensions(const Extensions& rhs):
@@ -246,7 +246,7 @@ void VertexProgram::Extensions::lowestCommonDenominator(const Extensions& rhs)
}
void VertexProgram::Extensions::setupGLExtenions(unsigned int contextID)
void VertexProgram::Extensions::setupGLExtensions(unsigned int contextID)
{
_isVertexProgramSupported = isGLExtensionSupported(contextID,"GL_ARB_vertex_program");