Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

Moved the #defines into new include/osg/GLDefines
Converted all GL2Extensions usage to GLExtensions usage


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14593 16af8721-9629-0410-8352-f15c8da7e697

include/osg/BufferObject

@@ -16,7 +16,7 @@
 #define OSG_BUFFEROBJECT 1
 
 #include <osg/GL>
-#include <osg/GL2Extensions>
+#include <osg/GLExtensions>
 #include <osg/Object>
 #include <osg/buffered_value>
 #include <osg/FrameStamp>
@@ -268,7 +268,7 @@ class OSG_EXPORT GLBufferObject : public Referenced
         unsigned int            _frameLastUsed;
 
     public:
-        GL2Extensions*          _extensions;
+        GLExtensions*          _extensions;
 
 };
 

include/osg/FrameBufferObject

@@ -144,7 +144,7 @@ class OSG_EXPORT RenderBuffer: public Object
         inline void setSamples(int samples);
         inline void setColorSamples(int colorSamples);
 
-        GLuint getObjectID(unsigned int contextID, const GL2Extensions *ext) const;
+        GLuint getObjectID(unsigned int contextID, const GLExtensions *ext) const;
         inline int compare(const RenderBuffer &rb) const;
 
         /** Mark internal RenderBuffer for deletion.
@@ -161,7 +161,7 @@ class OSG_EXPORT RenderBuffer: public Object
           * this call is useful for when an OpenGL context has been destroyed. */
         static void discardDeletedRenderBuffers(unsigned int contextID);
 
-        static int getMaxSamples(unsigned int contextID, const GL2Extensions* ext);
+        static int getMaxSamples(unsigned int contextID, const GLExtensions* ext);
 
         /** Resize any per context GLObject buffers to specified size. */
         virtual void resizeGLObjectBuffers(unsigned int maxSize);
@@ -303,8 +303,8 @@ class OSG_EXPORT FrameBufferAttachment
         FrameBufferAttachment&operator = (const FrameBufferAttachment& copy);
 
         bool isMultisample() const;
-        void createRequiredTexturesAndApplyGenerateMipMap(State& state, const GL2Extensions* ext) const;
-        void attach(State &state, GLenum target, GLenum attachment_point, const GL2Extensions* ext) const;
+        void createRequiredTexturesAndApplyGenerateMipMap(State& state, const GLExtensions* ext) const;
+        void attach(State &state, GLenum target, GLenum attachment_point, const GLExtensions* ext) const;
         int compare(const FrameBufferAttachment &fa) const;
 
         RenderBuffer* getRenderBuffer();

include/osg/GL2Extensions

@@ -1,10 +1,12 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2014 Robert Osfield
  * Copyright (C) 2003-2005 3Dlabs Inc. Ltd.
  * Copyright (C) 2004-2005 Nathan Cournia
  * Copyright (C) 2007 Art Tevs
  * Copyright (C) 2008 Zebra Imaging
  * Copyright (C) 2010 VIRES Simulationstechnologie GmbH
  * Copyright (C) 2012 David Callu
+ * Copyright (C) 2008 Mike Weiblen
+ * Copyright (C) 2012 Holger Helmich
  *
  * This application is open source and may be redistributed and/or modified
  * freely and without restriction, both in commercial and non commercial
@@ -15,17 +17,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
-/* file:        include/osg/GL2Extensions
- * author:      Mike Weiblen 2008-01-02
- *              Holger Helmich 2010-10-21
-*/
-
 #ifndef OSG_GL2EXTENSIONS
 #define OSG_GL2EXTENSIONS 1
 
 #include <osg/Referenced>
 #include <osg/GL>
 
+
 #include <string>
 
 

include/osg/GLExtensions

@@ -15,6 +15,8 @@
 #define OSG_GLEXTENSIONS 1
 
 #include <osg/Export>
+#include <osg/GLDefines>
+
 #include <stdlib.h>
 #include <string.h>
 #include <string>
@@ -121,6 +123,463 @@ bool setGLExtensionFuncPtr(T& t, const char* str1, const char* str2, const char*
     return convertPointer(t, osg::getGLExtensionFuncPtr(str1, str2, str3));
 }
 
+/** Main GLExtensions class for managing OpenGL extensions per graphics context.*/
+class OSG_EXPORT GLExtensions : public osg::Referenced
+{
+    public:
+        GLExtensions(unsigned int contextID);
+
+        /** Function to call to get the extension of a specified context.
+          * If the Exentsion object for that context has not yet been created then
+          * and the 'createIfNotInitalized' flag been set to false then returns NULL.
+          * If 'createIfNotInitalized' is true then the Extensions object is
+          * automatically created.  However, in this case the extension object
+          * only be created with the graphics context associated with ContextID..*/
+        static GLExtensions* Get(unsigned int contextID,bool createIfNotInitalized);
+
+        /** 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 Set(unsigned int contextID, GLExtensions* extensions);
+
+        // C++-friendly convenience wrapper methods
+        GLuint getCurrentProgram() const;
+        bool getProgramInfoLog( GLuint program, std::string& result ) const;
+        bool getShaderInfoLog( GLuint shader, std::string& result ) const;
+        bool getAttribLocation( const char* attribName, GLuint& slot ) const;
+        bool getFragDataLocation( const char* fragDataName, GLuint& slot) const;
+
+
+        float glVersion;
+        float glslLanguageVersion;
+
+        bool isGlslSupported;
+        bool isShaderObjectsSupported;
+        bool isVertexShaderSupported;
+        bool isFragmentShaderSupported;
+        bool isLanguage100Supported;
+        bool isGeometryShader4Supported;
+        bool areTessellationShadersSupported;
+        bool isGpuShader4Supported;
+        bool isUniformBufferObjectSupported;
+        bool isGetProgramBinarySupported;
+        bool isGpuShaderFp64Supported;
+        bool isShaderAtomicCountersSupported;
+        bool isRectangleSupported;
+        bool isCubeMapSupported;
+
+        void (GL_APIENTRY * glDrawBuffers)(GLsizei n, const GLenum *bufs);
+        void (GL_APIENTRY * glAttachShader)(GLuint program, GLuint shader);
+        void (GL_APIENTRY * glBindAttribLocation)(GLuint program, GLuint index, const GLchar *name);
+        void (GL_APIENTRY * glCompileShader)(GLuint shader);
+        GLuint (GL_APIENTRY * glCreateProgram)(void);
+        GLuint (GL_APIENTRY * glCreateShader)(GLenum type);
+        void (GL_APIENTRY * glDeleteProgram)(GLuint program);
+        void (GL_APIENTRY * glDeleteObjectARB)(GLuint program);
+        void (GL_APIENTRY * glDeleteShader)(GLuint shader);
+        void (GL_APIENTRY * glDetachShader)(GLuint program, GLuint shader);
+        void (GL_APIENTRY * glDisableVertexAttribArray)(GLuint index);
+        void (GL_APIENTRY * glEnableVertexAttribArray)(GLuint index);
+        void (GL_APIENTRY * glGetActiveAttrib)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+        void (GL_APIENTRY * glGetActiveUniform)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+        void (GL_APIENTRY * glGetAttachedShaders)(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+        GLint (GL_APIENTRY * glGetAttribLocation)(GLuint program, const GLchar *name);
+        void (GL_APIENTRY * glGetProgramiv)(GLuint program, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGetObjectParameterivARB)(GLuint program, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGetProgramInfoLog)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+        void (GL_APIENTRY * glGetInfoLogARB)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+        void (GL_APIENTRY * glGetShaderiv)(GLuint shader, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGetShaderInfoLog)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+        void (GL_APIENTRY * glGetShaderSource)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+        GLint (GL_APIENTRY * glGetUniformLocation)(GLuint program, const GLchar *name);
+        void (GL_APIENTRY * glGetUniformfv)(GLuint program, GLint location, GLfloat *params);
+        void (GL_APIENTRY * glGetUniformiv)(GLuint program, GLint location, GLint *params);
+        void (GL_APIENTRY * glGetVertexAttribdv)(GLuint index, GLenum pname, GLdouble *params);
+        void (GL_APIENTRY * glGetVertexAttribfv)(GLuint index, GLenum pname, GLfloat *params);
+        void (GL_APIENTRY * glGetVertexAttribiv)(GLuint index, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid* *pointer);
+        GLboolean (GL_APIENTRY * glIsProgram)(GLuint program);
+        GLboolean (GL_APIENTRY * glIsShader)(GLuint shader);
+        void (GL_APIENTRY * glLinkProgram)(GLuint program);
+        void (GL_APIENTRY * glShaderSource)(GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+        void (GL_APIENTRY * glUseProgram)(GLuint program);
+        void (GL_APIENTRY * glUniform1f)(GLint location, GLfloat v0);
+        void (GL_APIENTRY * glUniform2f)(GLint location, GLfloat v0, GLfloat v1);
+        void (GL_APIENTRY * glUniform3f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+        void (GL_APIENTRY * glUniform4f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+        void (GL_APIENTRY * glUniform1i)(GLint location, GLint v0);
+        void (GL_APIENTRY * glUniform2i)(GLint location, GLint v0, GLint v1);
+        void (GL_APIENTRY * glUniform3i)(GLint location, GLint v0, GLint v1, GLint v2);
+        void (GL_APIENTRY * glUniform4i)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+        void (GL_APIENTRY * glUniform1fv)(GLint location, GLsizei count, const GLfloat *value);
+        void (GL_APIENTRY * glUniform2fv)(GLint location, GLsizei count, const GLfloat *value);
+        void (GL_APIENTRY * glUniform3fv)(GLint location, GLsizei count, const GLfloat *value);
+        void (GL_APIENTRY * glUniform4fv)(GLint location, GLsizei count, const GLfloat *value);
+        void (GL_APIENTRY * glUniform1iv)(GLint location, GLsizei count, const GLint *value);
+        void (GL_APIENTRY * glUniform2iv)(GLint location, GLsizei count, const GLint *value);
+        void (GL_APIENTRY * glUniform3iv)(GLint location, GLsizei count, const GLint *value);
+        void (GL_APIENTRY * glUniform4iv)(GLint location, GLsizei count, const GLint *value);
+        void (GL_APIENTRY * glUniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+        void (GL_APIENTRY * glUniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+        void (GL_APIENTRY * glUniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+        void (GL_APIENTRY * glValidateProgram)(GLuint program);
+        void (GL_APIENTRY * glVertexAttrib1d)(GLuint index, GLdouble x);
+        void (GL_APIENTRY * glVertexAttrib1dv)(GLuint index, const GLdouble *v);
+        void (GL_APIENTRY * glVertexAttrib1f)(GLuint index, GLfloat x);
+        void (GL_APIENTRY * glVertexAttrib1fv)(GLuint index, const GLfloat *v);
+        void (GL_APIENTRY * glVertexAttrib1s)(GLuint index, GLshort x);
+        void (GL_APIENTRY * glVertexAttrib1sv)(GLuint index, const GLshort *v);
+        void (GL_APIENTRY * glVertexAttrib2d)(GLuint index, GLdouble x, GLdouble y);
+        void (GL_APIENTRY * glVertexAttrib2dv)(GLuint index, const GLdouble *v);
+        void (GL_APIENTRY * glVertexAttrib2f)(GLuint index, GLfloat x, GLfloat y);
+        void (GL_APIENTRY * glVertexAttrib2fv)(GLuint index, const GLfloat *v);
+        void (GL_APIENTRY * glVertexAttrib2s)(GLuint index, GLshort x, GLshort y);
+        void (GL_APIENTRY * glVertexAttrib2sv)(GLuint index, const GLshort *v);
+        void (GL_APIENTRY * glVertexAttrib3d)(GLuint index, GLdouble x, GLdouble y, GLdouble z);
+        void (GL_APIENTRY * glVertexAttrib3dv)(GLuint index, const GLdouble *v);
+        void (GL_APIENTRY * glVertexAttrib3f)(GLuint index, GLfloat x, GLfloat y, GLfloat z);
+        void (GL_APIENTRY * glVertexAttrib3fv)(GLuint index, const GLfloat *v);
+        void (GL_APIENTRY * glVertexAttrib3s)(GLuint index, GLshort x, GLshort y, GLshort z);
+        void (GL_APIENTRY * glVertexAttrib3sv)(GLuint index, const GLshort *v);
+        void (GL_APIENTRY * glVertexAttrib4Nbv)(GLuint index, const GLbyte *v);
+        void (GL_APIENTRY * glVertexAttrib4Niv)(GLuint index, const GLint *v);
+        void (GL_APIENTRY * glVertexAttrib4Nsv)(GLuint index, const GLshort *v);
+        void (GL_APIENTRY * glVertexAttrib4Nub)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+        void (GL_APIENTRY * glVertexAttrib4Nubv)(GLuint index, const GLubyte *v);
+        void (GL_APIENTRY * glVertexAttrib4Nuiv)(GLuint index, const GLuint *v);
+        void (GL_APIENTRY * glVertexAttrib4Nusv)(GLuint index, const GLushort *v);
+        void (GL_APIENTRY * glVertexAttrib4bv)(GLuint index, const GLbyte *v);
+        void (GL_APIENTRY * glVertexAttrib4d)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+        void (GL_APIENTRY * glVertexAttrib4dv)(GLuint index, const GLdouble *v);
+        void (GL_APIENTRY * glVertexAttrib4f)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+        void (GL_APIENTRY * glVertexAttrib4fv)(GLuint index, const GLfloat *v);
+        void (GL_APIENTRY * glVertexAttrib4iv)(GLuint index, const GLint *v);
+        void (GL_APIENTRY * glVertexAttrib4s)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+        void (GL_APIENTRY * glVertexAttrib4sv)(GLuint index, const GLshort *v);
+        void (GL_APIENTRY * glVertexAttrib4ubv)(GLuint index, const GLubyte *v);
+        void (GL_APIENTRY * glVertexAttrib4uiv)(GLuint index, const GLuint *v);
+        void (GL_APIENTRY * glVertexAttrib4usv)(GLuint index, const GLushort *v);
+        void (GL_APIENTRY * glVertexAttribPointer)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+        void (GL_APIENTRY * glVertexAttribDivisor)(GLuint index, GLuint divisor);
+        void (GL_APIENTRY * glUniformMatrix2x3fv)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
+        void (GL_APIENTRY * glUniformMatrix3x2fv)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
+        void (GL_APIENTRY * glUniformMatrix2x4fv)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
+        void (GL_APIENTRY * glUniformMatrix4x2fv)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
+        void (GL_APIENTRY * glUniformMatrix3x4fv)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
+        void (GL_APIENTRY * glUniformMatrix4x3fv)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
+        void (GL_APIENTRY * glProgramParameteri)( GLuint program, GLenum pname, GLint value );
+        void (GL_APIENTRY * glPatchParameteri)( GLenum pname, GLint value );
+        void (GL_APIENTRY * glPatchParameterfv)( GLenum pname, const GLfloat* values );
+        void (GL_APIENTRY * glGetUniformuiv)( GLuint program, GLint location, GLuint* params );
+        void (GL_APIENTRY * glBindFragDataLocation)( GLuint program, GLuint color, const GLchar* name );
+        GLint (GL_APIENTRY * glGetFragDataLocation)( GLuint program, const GLchar* name );
+        void (GL_APIENTRY * glUniform1ui)( GLint location, GLuint v0 );
+        void (GL_APIENTRY * glUniform2ui)( GLint location, GLuint v0, GLuint v1 );
+        void (GL_APIENTRY * glUniform3ui)( GLint location, GLuint v0, GLuint v1, GLuint v2 );
+        void (GL_APIENTRY * glUniform4ui)( GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3 );
+        void (GL_APIENTRY * glUniform1uiv)( GLint location, GLsizei count, const GLuint *value );
+        void (GL_APIENTRY * glUniform2uiv)( GLint location, GLsizei count, const GLuint *value );
+        void (GL_APIENTRY * glUniform3uiv)( GLint location, GLsizei count, const GLuint *value );
+        void (GL_APIENTRY * glUniform4uiv)( GLint location, GLsizei count, const GLuint *value );
+        GLuint (GL_APIENTRY * glGetHandleARB) (GLenum pname);
+        void (GL_APIENTRY * glGetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
+        void (GL_APIENTRY * glGetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGetActiveUniformName)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+        GLuint (GL_APIENTRY * glGetUniformBlockIndex)(GLuint program, const GLchar *uniformBlockName);
+        void (GL_APIENTRY * glGetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+        void (GL_APIENTRY * glUniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+        void (GL_APIENTRY * glGetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+        void (GL_APIENTRY * glProgramBinary)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
+        void (GL_APIENTRY * glUniform1d)(GLint location, GLdouble v0);
+        void (GL_APIENTRY * glUniform2d)(GLint location, GLdouble v0, GLdouble v1);
+        void (GL_APIENTRY * glUniform3d)(GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+        void (GL_APIENTRY * glUniform4d)(GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+        void (GL_APIENTRY * glUniform1dv)(GLint location, GLsizei count, const GLdouble *value);
+        void (GL_APIENTRY * glUniform2dv)(GLint location, GLsizei count, const GLdouble *value);
+        void (GL_APIENTRY * glUniform3dv)(GLint location, GLsizei count, const GLdouble *value);
+        void (GL_APIENTRY * glUniform4dv)(GLint location, GLsizei count, const GLdouble *value);
+        void (GL_APIENTRY * glUniformMatrix2dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+        void (GL_APIENTRY * glUniformMatrix3dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+        void (GL_APIENTRY * glUniformMatrix4dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+        void (GL_APIENTRY * glUniformMatrix2x3dv)( GLint location, GLsizei count, GLboolean transpose, const GLdouble* value );
+        void (GL_APIENTRY * glUniformMatrix3x2dv)( GLint location, GLsizei count, GLboolean transpose, const GLdouble* value );
+        void (GL_APIENTRY * glUniformMatrix2x4dv)( GLint location, GLsizei count, GLboolean transpose, const GLdouble* value );
+        void (GL_APIENTRY * glUniformMatrix4x2dv)( GLint location, GLsizei count, GLboolean transpose, const GLdouble* value );
+        void (GL_APIENTRY * glUniformMatrix3x4dv)( GLint location, GLsizei count, GLboolean transpose, const GLdouble* value );
+        void (GL_APIENTRY * glUniformMatrix4x3dv)( GLint location, GLsizei count, GLboolean transpose, const GLdouble* value );
+        void (GL_APIENTRY * glGetActiveAtomicCounterBufferiv)( GLuint program, GLuint bufferIndex, GLenum pname, GLint* params );
+        void (GL_APIENTRY * glDispatchCompute)( GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ );
+
+        // Buffer Object extensions
+        bool isBufferObjectSupported;
+        bool isPBOSupported;
+        bool isTBOSupported;
+
+        void (GL_APIENTRY * glGenBuffers) (GLsizei n, GLuint *buffers);
+        void (GL_APIENTRY * glBindBuffer) (GLenum target, GLuint buffer);
+        void (GL_APIENTRY * glBufferData) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+        void (GL_APIENTRY * glBufferSubData) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+        void (GL_APIENTRY * glDeleteBuffers) (GLsizei n, const GLuint *buffers);
+        GLboolean (GL_APIENTRY * glIsBuffer) (GLuint buffer);
+        void (GL_APIENTRY * glGetBufferSubData) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+        GLvoid* (GL_APIENTRY * glMapBuffer) (GLenum target, GLenum access);
+        GLvoid* (GL_APIENTRY * glMapBufferRange)(GLenum target,  GLintptr offset,  GLsizeiptr length,  GLbitfield access);
+        GLboolean (GL_APIENTRY * glUnmapBuffer) (GLenum target);
+        void (GL_APIENTRY * glGetBufferParameteriv) (GLenum target, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGetBufferPointerv) (GLenum target, GLenum pname, GLvoid* *params);
+        void (GL_APIENTRY * glBindBufferRange) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+        void (GL_APIENTRY * glBindBufferBase) (GLenum target, GLuint index, GLuint buffer);
+        void (GL_APIENTRY * glTexBuffer) (GLenum target, GLenum internalFormat, GLuint buffer);
+
+        void (GL_APIENTRY * glMemoryBarrier)( GLbitfield barriers );
+
+        // BlendFunc extensions
+        bool                isBlendFuncSeparateSupported;
+        void (GL_APIENTRY * glBlendFuncSeparate) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha) ;
+
+        void (GL_APIENTRY * glBlendFunci) (GLuint buf, GLenum src, GLenum dst);
+        void (GL_APIENTRY * glBlendFuncSeparatei) (GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha) ;
+
+
+        // Vertex Array extensions
+        bool isSecondaryColorSupported;
+        bool isFogCoordSupported;
+        bool isMultiTexSupported;
+        bool isOcclusionQuerySupported;
+        bool isARBOcclusionQuerySupported;
+        bool isTimerQuerySupported;
+        bool isARBTimerQuerySupported;
+
+        void (GL_APIENTRY * glSecondaryColor3ubv) (const GLubyte* coord);
+        void (GL_APIENTRY * glSecondaryColor3fv) (const GLfloat* coord);
+
+        void (GL_APIENTRY * glFogCoordfv) (const GLfloat* coord);
+
+        void (GL_APIENTRY * glMultiTexCoord1f) (GLenum target,GLfloat coord);
+        void (GL_APIENTRY * glMultiTexCoord1fv) (GLenum target,const GLfloat* coord);
+        void (GL_APIENTRY * glMultiTexCoord2fv) (GLenum target,const GLfloat* coord);
+        void (GL_APIENTRY * glMultiTexCoord3fv) (GLenum target,const GLfloat* coord);
+        void (GL_APIENTRY * glMultiTexCoord4fv) (GLenum target,const GLfloat* coord);
+
+        void (GL_APIENTRY * glMultiTexCoord1d) (GLenum target,GLdouble coord);
+        void (GL_APIENTRY * glMultiTexCoord1dv) (GLenum target,const GLdouble* coord);
+        void (GL_APIENTRY * glMultiTexCoord2dv) (GLenum target,const GLdouble* coord);
+        void (GL_APIENTRY * glMultiTexCoord3dv) (GLenum target,const GLdouble* coord);
+        void (GL_APIENTRY * glMultiTexCoord4dv) (GLenum target,const GLdouble* coord);
+
+        // Occlusion Query extensions
+        void (GL_APIENTRY * glGenOcclusionQueries) ( GLsizei n, GLuint *ids );
+        void (GL_APIENTRY * glDeleteOcclusionQueries) ( GLsizei n, const GLuint *ids );
+        GLboolean (GL_APIENTRY * glIsOcclusionQuery) ( GLuint id );
+        void (GL_APIENTRY * glBeginOcclusionQuery) ( GLuint id );
+        void (GL_APIENTRY * glEndOcclusionQuery) ();
+        void (GL_APIENTRY * glGetOcclusionQueryiv) ( GLuint id, GLenum pname, GLint *params );
+        void (GL_APIENTRY * glGetOcclusionQueryuiv) ( GLuint id, GLenum pname, GLuint *params );
+
+        void (GL_APIENTRY * glGetQueryiv) (GLenum target, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGenQueries) (GLsizei n, GLuint *ids);
+        void (GL_APIENTRY * glBeginQuery) (GLenum target, GLuint id);
+        void (GL_APIENTRY * glEndQuery) (GLenum target);
+        void (GL_APIENTRY * glQueryCounter) (GLuint id, GLenum target);
+        GLboolean (GL_APIENTRY * glIsQuery) (GLuint id);
+        void (GL_APIENTRY * glDeleteQueries) (GLsizei n, const GLuint *ids);
+        void (GL_APIENTRY * glGetQueryObjectiv) (GLuint id, GLenum pname, GLint *params);
+        void (GL_APIENTRY * glGetQueryObjectuiv) (GLuint id, GLenum pname, GLuint *params);
+        void (GL_APIENTRY * glGetQueryObjectui64v) (GLuint id, GLenum pname, GLuint64 *params);
+        void (GL_APIENTRY * glGetInteger64v) (GLenum pname, GLint64 *params);
+
+
+        // SampleMaski functionality
+        bool isOpenGL32upported;
+        bool isTextureMultisampleSupported;
+        bool isSampleMaskiSupported;
+
+        void (GL_APIENTRY * glSampleMaski) (GLuint maskNumber, GLbitfield mask);
+
+        // Vertex/Fragment Programs
+        bool isVertexProgramSupported;
+        bool isFragmentProgramSupported;
+
+        void (GL_APIENTRY * glBindProgram) (GLenum target, GLuint id);
+        void (GL_APIENTRY * glGenPrograms) (GLsizei n, GLuint *programs);
+        void (GL_APIENTRY * glDeletePrograms) (GLsizei n, GLuint *programs);
+        void (GL_APIENTRY * glProgramString) (GLenum target, GLenum format, GLsizei len, const void *string);
+        void (GL_APIENTRY * glProgramLocalParameter4fv) (GLenum target, GLuint index, const GLfloat *params);
+
+
+        // Texture Extensions
+        bool isMultiTexturingSupported;
+        bool isTextureFilterAnisotropicSupported;
+        bool isTextureSwizzleSupported;
+        bool isTextureCompressionARBSupported;
+        bool isTextureCompressionS3TCSupported;
+        bool isTextureCompressionPVRTC2BPPSupported;
+        bool isTextureCompressionPVRTC4BPPSupported;
+        bool isTextureCompressionETCSupported;
+        bool isTextureCompressionETC2Supported;
+        bool isTextureCompressionRGTCSupported;
+        bool isTextureCompressionPVRTCSupported;
+        bool isTextureMirroredRepeatSupported;
+        bool isTextureEdgeClampSupported;
+        bool isTextureBorderClampSupported;
+        bool isGenerateMipMapSupported;
+        bool preferGenerateMipmapSGISForPowerOfTwo;
+        bool isTextureMultisampledSupported;
+        bool isShadowSupported;
+        bool isShadowAmbientSupported;
+        bool isTextureMaxLevelSupported;
+        GLint maxTextureSize;
+        bool _isTextureStorageEnabled;
+        bool isClientStorageSupported;
+        bool isTextureIntegerEXTSupported;
+        bool isTextureStorageEnabled;
+
+        bool isTexStorage2DSupported() const { return glTexStorage2D != 0; }
+        bool isCompressedTexImage2DSupported() const { return glCompressedTexImage2D!=0; }
+        bool isCompressedTexSubImage2DSupported() const { return glCompressedTexSubImage2D!=0; }
+        bool isBindImageTextureSupported() const { return glBindImageTexture!=0; }
+        bool isNonPowerOfTwoTextureMipMappedSupported;
+        bool isNonPowerOfTwoTextureNonMipMappedSupported;
+        bool isNonPowerOfTwoTextureSupported(GLenum filter) const
+        {
+            return (filter==GL_LINEAR || filter==GL_NEAREST) ?
+                    isNonPowerOfTwoTextureNonMipMappedSupported :
+                    isNonPowerOfTwoTextureMipMappedSupported;
+        }
+
+        void (GL_APIENTRY * glTexStorage2D) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+        void (GL_APIENTRY * glCompressedTexImage2D) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+        void (GL_APIENTRY * glCompressedTexSubImage2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+        void (GL_APIENTRY * glGetCompressedTexImage) (GLenum target, GLint level, GLvoid *data);
+        void (GL_APIENTRY * glTexImage2DMultisample) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+        void (GL_APIENTRY * glTexParameterIiv) (GLenum target, GLenum pname, const GLint* data);
+        void (GL_APIENTRY * glTexParameterIuiv) (GLenum target, GLenum pname, const GLuint* data);
+        void (GL_APIENTRY * glBindImageTexture) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+
+        // Texture3D extensions
+        bool isTexture3DSupported;
+        bool isTexture3DFast;
+        GLint maxTexture3DSize;
+        bool isCompressedTexImage3DSupported() const { return glCompressedTexImage3D!=0; }
+        bool isCompressedTexSubImage3DSupported() const { return glCompressedTexSubImage3D!=0; }
+
+        void (GL_APIENTRY * glTexImage3D) ( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+        void (GL_APIENTRY * glTexSubImage3D) ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+        void (GL_APIENTRY * glCopyTexSubImage3D) ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+        void (GL_APIENTRY * glCompressedTexImage3D) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+        void (GL_APIENTRY * glCompressedTexSubImage3D) ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+        // Texture2DArray extensions
+        bool isTexture2DArraySupported;
+        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);
+
+
+        // Stencil
+        bool isStencilWrapSupported;
+        bool isStencilTwoSidedSupported;
+        bool isOpenGL20Supported;
+        bool isSeparateStencilSupported;
+
+        void (GL_APIENTRY * glActiveStencilFace) (GLenum face);
+        void (GL_APIENTRY * glStencilOpSeparate) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+        void (GL_APIENTRY * glStencilMaskSeparate) (GLenum face, GLuint mask);
+        void (GL_APIENTRY * glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask);
+        void (GL_APIENTRY * glStencilFuncSeparateATI) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+
+
+        // ColorMask
+        void (GL_APIENTRY * glColorMaski)(GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+
+
+        // ClampColor
+        bool isClampColorSupported;
+        void (GL_APIENTRY * glClampColor) (GLenum target, GLenum mode);
+
+
+        // PrimitiveRestartIndex
+        void (GL_APIENTRY * glPrimitiveRestartIndex) ( GLuint index );
+
+
+        // Mutlisample
+        bool isMultisampleSupported;
+        bool isMultisampleFilterHintSupported;
+
+        void (GL_APIENTRY * glSampleCoverage) (GLclampf value, GLboolean invert);
+
+
+        // Point
+        bool isPointParametersSupported;
+        bool isPointSpriteSupported;
+        bool isPointSpriteCoordOriginSupported;
+
+        void (GL_APIENTRY * glPointParameteri) (GLenum pname, GLint param);
+        void (GL_APIENTRY * glPointParameterf) (GLenum pname, GLfloat param);
+        void (GL_APIENTRY * glPointParameterfv) (GLenum pname, const GLfloat *params);
+
+
+        // FrameBuferObject
+        bool isFrameBufferObjectSupported;
+        bool isPackedDepthStencilSupported;
+        bool isRenderbufferMultisampleSupported() const { return glRenderbufferStorageMultisample != 0; }
+        bool isRenderbufferMultisampleCoverageSupported() const { return glRenderbufferStorageMultisampleCoverageNV != 0; }
+
+        void (GL_APIENTRY * glBindRenderbuffer) (GLenum, GLuint);
+        void (GL_APIENTRY * glDeleteRenderbuffers) (GLsizei n, const GLuint *renderbuffers);
+        void (GL_APIENTRY * glGenRenderbuffers) (GLsizei, GLuint *);
+        void (GL_APIENTRY * glRenderbufferStorage) (GLenum, GLenum, GLsizei, GLsizei);
+        void (GL_APIENTRY * glRenderbufferStorageMultisample) (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+        void (GL_APIENTRY * glRenderbufferStorageMultisampleCoverageNV) (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
+        void (GL_APIENTRY * glBindFramebuffer) (GLenum, GLuint);
+        void (GL_APIENTRY * glDeleteFramebuffers) (GLsizei n, const GLuint *framebuffers);
+        void (GL_APIENTRY * glGenFramebuffers) (GLsizei, GLuint *);
+        GLenum (GL_APIENTRY * glCheckFramebufferStatus) (GLenum);
+
+        void (GL_APIENTRY * glFramebufferTexture1D) (GLenum, GLenum, GLenum, GLuint, GLint);
+        void (GL_APIENTRY * glFramebufferTexture2D) (GLenum, GLenum, GLenum, GLuint, GLint);
+        void (GL_APIENTRY * glFramebufferTexture3D) (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+        void (GL_APIENTRY * glFramebufferTexture) (GLenum, GLenum, GLint, GLint);
+        void (GL_APIENTRY * glFramebufferTextureLayer) (GLenum, GLenum, GLuint, GLint, GLint);
+        void (GL_APIENTRY * glFramebufferTextureFace)( GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face );
+        void (GL_APIENTRY * glFramebufferRenderbuffer) (GLenum, GLenum, GLenum, GLuint);
+
+        void (GL_APIENTRY * glGenerateMipmap) (GLenum);
+        void (GL_APIENTRY * glBlitFramebuffer) (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+        void (GL_APIENTRY * glGetRenderbufferParameteriv) (GLenum, GLenum, GLint*);
+
+
+        // Sync
+        GLsync (GL_APIENTRY * glFenceSync) (GLenum condition, GLbitfield flags);
+        GLboolean (GL_APIENTRY * glIsSync) (GLsync sync);
+        void (GL_APIENTRY * glDeleteSync) (GLsync sync);
+        GLenum (GL_APIENTRY * glClientWaitSync) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+        void (GL_APIENTRY * glWaitSync) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+        void (GL_APIENTRY * glGetSynciv) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+
+
+};
+
+
 }
 
 #endif

include/osg/PatchParameter

@@ -17,7 +17,6 @@
 #include <osg/Vec2>
 #include <osg/Vec4>
 #include <osg/StateAttribute>
-#include <osg/GL2Extensions>
 
 namespace osg {
 
@@ -59,13 +58,13 @@ class OSG_EXPORT PatchParameter : public StateAttribute
 
         /** Get GL_PATCH_VERTICES parameter.*/
         GLint getVertices() const { return _vertices; }
-        
+
         /** Set GL_PATCH_DEFAULT_INNER_LEVEL parameter.*/
         void setPatchDefaultInnerLevel(const osg::Vec2& level) { _patchDefaultInnerLevel = level; }
 
         /** Get GL_PATCH_DEFAULT_INNER_LEVEL parameter.*/
         const osg::Vec2& getPatchDefaultInnerLevel() const { return _patchDefaultInnerLevel; }
-        
+
         /** Set GL_PATCH_DEFAULT_OUTER_LEVEL parameter.*/
         void setPatchDefaultOuterLevel(const osg::Vec4& level) { _patchDefaultOuterLevel = level; }
 

include/osg/PrimitiveSet

@@ -24,7 +24,6 @@
 #include <osg/Vec3d>
 #include <osg/Vec4d>
 #include <osg/MixinVector>
-#include <osg/GL2Extensions>
 
 #include <osg/BufferObject>
 

include/osg/Program

@@ -331,7 +331,7 @@ class OSG_EXPORT Program : public osg::StateAttribute
                 /** Pointer to our parent Program */
                 const Program* _program;
                 /** Pointer to this context's extension functions */
-                osg::ref_ptr<GL2Extensions> _extensions;
+                osg::ref_ptr<GLExtensions> _extensions;
                 /** Handle to the actual OpenGL glProgram */
                 GLuint _glProgramHandle;
                 /** Does our glProgram need to be linked? */
@@ -342,7 +342,7 @@ class OSG_EXPORT Program : public osg::StateAttribute
                 bool _loadedBinary;
 
                 const unsigned int _contextID;
-                
+
                 /** Does the glProgram handle belongs to this class? */
                 bool _ownsProgramHandle;
 

include/osg/Shader

@@ -22,7 +22,7 @@
 #define OSG_SHADER 1
 
 
-#include <osg/GL2Extensions>
+#include <osg/GLExtensions>
 #include <osg/Object>
 #include <osg/buffered_value>
 
@@ -236,7 +236,7 @@ class OSG_EXPORT Shader : public osg::Object
                 /** Pointer to our parent osg::Shader */
                 const Shader* _shader;
                 /** Pointer to this context's extension functions. */
-                osg::ref_ptr<osg::GL2Extensions> _extensions;
+                osg::ref_ptr<osg::GLExtensions> _extensions;
                 /** Handle to the actual glShader. */
                 GLuint _glShaderHandle;
                 /** Does our glShader need to be recompiled? */

include/osg/State

@@ -15,7 +15,7 @@
 #define OSG_STATE 1
 
 #include <osg/Export>
-#include <osg/GL2Extensions>
+#include <osg/GLExtensions>
 #include <osg/StateSet>
 #include <osg/Matrix>
 #include <osg/Uniform>
@@ -1941,7 +1941,7 @@ class OSG_EXPORT State : public Referenced
         DrawArraysInstancedProc     _glDrawArraysInstanced;
         DrawElementsInstancedProc   _glDrawElementsInstanced;
 
-        osg::ref_ptr<GL2Extensions> _gl2Extentsions;
+        osg::ref_ptr<GLExtensions>  _glExtensions;
 
         unsigned int                                            _dynamicObjectCount;
         osg::ref_ptr<DynamicObjectRenderingCompletedCallback>   _completeDynamicObjectRenderingCallback;
@@ -2777,8 +2777,8 @@ inline bool State::setActiveTextureUnit( unsigned int unit )
 }
 
 // forward declare speciailization of State::get() method
-template<> inline GL2Extensions* State::get<GL2Extensions>() { return _gl2Extentsions.get(); }
-template<> inline const GL2Extensions* State::get<GL2Extensions>() const { return _gl2Extentsions.get(); }
+template<> inline GLExtensions* State::get<GLExtensions>() { return _glExtensions.get(); }
+template<> inline const GLExtensions* State::get<GLExtensions>() const { return _glExtensions.get(); }
 
 }
 

include/osg/Texture

@@ -23,7 +23,7 @@
 #include <osg/Vec4d>
 #include <osg/Vec4i>
 #include <osg/buffered_value>
-#include <osg/GL2Extensions>
+#include <osg/GLExtensions>
 
 #include <list>
 #include <map>

include/osg/TextureBuffer

@@ -121,7 +121,7 @@ class OSG_EXPORT TextureBuffer : public Texture
                 _id(0),
                 _usageHint(usageHint)
             {
-                _extensions = osg::GL2Extensions::Get(contextID, true);
+                _extensions = osg::GLExtensions::Get(contextID, true);
             }
 
             void bindBuffer(GLenum target);
@@ -134,7 +134,7 @@ class OSG_EXPORT TextureBuffer : public Texture
         public:
             GLuint _id;
             GLenum _usageHint;
-            osg::GL2Extensions* _extensions;
+            osg::GLExtensions* _extensions;
         };
 
         typedef osg::buffered_object<osg::ref_ptr<TextureBufferObject> > TextureBufferObjectList;

include/osg/Uniform

@@ -28,7 +28,7 @@
 #include <osg/Vec3d>
 #include <osg/Vec4d>
 #include <osg/Matrix>
-#include <osg/GL2Extensions>
+#include <osg/GLExtensions>
 
 #include <string.h> // for memset
 #include <string>
@@ -889,7 +889,7 @@ class OSG_EXPORT Uniform : public Object
         /** Get the number that the Uniform's name maps to uniquely */
         unsigned int getNameID() const;
 
-        void apply(const GL2Extensions* ext, GLint location) const;
+        void apply(const GLExtensions* ext, GLint location) const;
 
 
     protected:

include/osgViewer/Renderer

@@ -35,7 +35,7 @@ class OSGVIEWER_EXPORT OpenGLQuerySupport : public osg::Referenced
         virtual void initialize(osg::State* state, osg::Timer_t startTick);
     protected:
 
-        const osg::GL2Extensions*            _extensions;
+        const osg::GLExtensions*            _extensions;
 };
 
 class OSGVIEWER_EXPORT Renderer : public osg::GraphicsOperation