API doc: Add old glext-20130207.h header for complete extension association. Fix GL* API doc header, align w/ spec-overview.

1 files changed, 28 insertions, 42 deletions

diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index ddb312075..a1b09c5b4 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -19,6 +19,7 @@ GLHeader GLES2/gl2.h
 GLHeader GLES2/gl2ext.h
 GLHeader GLES3/gl3.h
 GLHeader GLES3/gl3ext.h
+GLHeader GL/glext-20130207.h
 
 # Imports needed by all glue code
 Import java.util.*
@@ -762,7 +763,7 @@ ClassJavadoc GL3ES3 /**
 ClassJavadoc GL3ES3  * <p> 
 ClassJavadoc GL3ES3  * Interface containing the common subset of core GL3 (OpenGL 3.1+) and GLES3 (OpenGL ES 3.0).<br/>
 ClassJavadoc GL3ES3  * This interface reflects only the programmable shader functionality of desktop and embedded OpenGL<br/>
-ClassJavadoc GL3ES3  * This interface is almost GLES3 complete, but lacks the <code>GL_ARB_ES3_compatibility</code> extension.<br/>
+ClassJavadoc GL3ES3  * This interface is almost GLES3 complete, lacking <code>GL_ARB_ES3_compatibility</code> extension.<br/>
 ClassJavadoc GL3ES3  * </p>
 ClassJavadoc GL3ES3  */
 
@@ -770,13 +771,13 @@ ClassJavadoc GL4ES3 /**
 ClassJavadoc GL4ES3  * <p> 
 ClassJavadoc GL4ES3  * Interface containing the common subset of core GL4 (OpenGL 4.0+) and GLES3 (OpenGL ES 3.0).<br/>
 ClassJavadoc GL4ES3  * This interface reflects only the programmable shader functionality of desktop and embedded OpenGL<br/>
-ClassJavadoc GL4ES3  * This interface is GLES3 complete.<br/>
+ClassJavadoc GL4ES3  * This interface is GLES3 complete w/o vendor extensions.<br/>
 ClassJavadoc GL4ES3  * </p>
 ClassJavadoc GL4ES3  */
 
 ClassJavadoc GL2GL3 /**
 ClassJavadoc GL2GL3  * <p> 
-ClassJavadoc GL2GL3  * Interface containing the common subset of core GL3 (OpenGL 3.1) and GL2 (OpenGL 3.0), 
+ClassJavadoc GL2GL3  * Interface containing the common subset of core GL3 (OpenGL 3.1+) and GL2,
 ClassJavadoc GL2GL3  * also known as the OpenGL 3.0 forward compatible, non deprecated subset.<br/>
 ClassJavadoc GL2GL3  * This interface reflects only the programmable shader functionality of desktop OpenGL<br/>
 ClassJavadoc GL2GL3  * </p>
@@ -784,67 +785,52 @@ ClassJavadoc GL2GL3  */
 
 ClassJavadoc GL2 /**
 ClassJavadoc GL2  * <p> 
-ClassJavadoc GL2  * This interface contains all core desktop OpenGL methods through
-ClassJavadoc GL2  * version 3.0, inclusive, as well as most of it's extensions defined at the
-ClassJavadoc GL2  * time of this specification.  Early OpenGL extensions whose functionality
-ClassJavadoc GL2  * was incorporated into core OpenGL by version 3.0, inclusive, are specifically
-ClassJavadoc GL2  * excluded.<br/>
-ClassJavadoc GL2  * Note: OpenGL 3.0 is the last subsumed version in the specification. 
-ClassJavadoc GL2  * You need to use a {@link GL3} or {@link GL3bc} OpenGL 3.1+ context to benefit
-ClassJavadoc GL2  * from new functionality and versions.
+ClassJavadoc GL2  * This interface contains all OpenGL [ 1.0 .. 3.0 ] methods,
+ClassJavadoc GL2  * as well as most of it's extensions defined at the time of this specification.
+ClassJavadoc GL2  * </p>
+ClassJavadoc GL2  * <p>
+ClassJavadoc GL2  * OpenGL extensions whose functionality was incorporated into core OpenGL &le; 3.0, 
+ClassJavadoc GL2  * are subsumed into the core namespace.</p>
 ClassJavadoc GL2  * </p>
 ClassJavadoc GL2  */
 
 ClassJavadoc GL3 /**
-ClassJavadoc GL3  * <p> 
-ClassJavadoc GL3  * This interface contains the core, forward compatible, OpenGL methods of GL 3.x, with x >=1,
-ClassJavadoc GL3  * as well as most of it's extensions defined at the time of this specification.<br/>
-ClassJavadoc GL3  * Note: OpenGL 3.0 forward compatible, non deprecated functionality is included in the 
-ClassJavadoc GL3  * 3.1 specification, hence the {@link GL2GL3} implemented interface.<br/>
-ClassJavadoc GL3  * Note: OpenGL 3.1 forward compatible, core profile abandoned fixed point functionality.
-ClassJavadoc GL3  * </p>
+ClassJavadoc GL3  * <p>This interface contains all OpenGL [ 3.1 .. 3.3 ] <i>core</i> methods,
+ClassJavadoc GL3  * as well as most of it's extensions defined at the time of this specification.</p>
+ClassJavadoc GL3  * <p>Note: OpenGL [ 3.1 .. 3.3 ] core profile does not includes fixed point functionality.</p>
 ClassJavadoc GL3  */
 
 ClassJavadoc GL3bc /**
-ClassJavadoc GL3bc  * <p> 
-ClassJavadoc GL3bc  * This interface containing all core and compatibility OpenGL methods of GL 3.x, with x >= 1,<br/>
-ClassJavadoc GL3bc  * as well as most of it's extensions defined at the time of this specification.
-ClassJavadoc GL3bc  * </p>
+ClassJavadoc GL3bc  * <p>This interface contains all OpenGL [ 3.1 .. 3.3 ] <i>compatibility</i>  methods,
+ClassJavadoc GL3bc  * as well as most of it's extensions defined at the time of this specification.</p>
+ClassJavadoc GL3bc  * <p>Note: OpenGL [ 3.1 .. 3.3 ] compatibility profile does includes fixed point functionality.</p>
 ClassJavadoc GL3bc  */
 
 ClassJavadoc GL4 /**
-ClassJavadoc GL4  * <p> 
-ClassJavadoc GL4  * This interface containing all core OpenGL methods of GL 4.x, with x >= 0,<br/>
-ClassJavadoc GL4  * as well as most of it's extensions defined at the time of this specification.
-ClassJavadoc GL4  * </p>
+ClassJavadoc GL4  * <p>This interface contains all OpenGL [ 4.0 .. 4.3 ] <i>core</i> methods,
+ClassJavadoc GL4  * as well as most of it's extensions defined at the time of this specification.</p>
+ClassJavadoc GL4  * <p>Note: OpenGL [ 4.0 .. 4.3 ] core profile does not includes fixed point functionality.</p>
 ClassJavadoc GL4  */
 
 ClassJavadoc GL4bc /**
-ClassJavadoc GL4bc  * <p> 
-ClassJavadoc GL4bc  * This interface containing all core and compatibility OpenGL methods of GL 4.x, with x >= 0,<br/>
-ClassJavadoc GL4bc  * as well as most of it's extensions defined at the time of this specification.
-ClassJavadoc GL4bc  * </p>
+ClassJavadoc GL4bc  * <p>This interface contains all OpenGL [ 4.0 .. 4.3 ] <i>compatibility</i> profile,
+ClassJavadoc GL4bc  * as well as most of it's extensions defined at the time of this specification.</p>
+ClassJavadoc GL4bc  * <p>Note: OpenGL [ 4.0 .. 4.3 ] compatibility profile does includes fixed point functionality.</p>
 ClassJavadoc GL4bc  */
 
 ClassJavadoc GLES1 /**
-ClassJavadoc GLES1  * <p> 
-ClassJavadoc GLES1  * This interface contains all core embedded OpenGL methods of ES 1.x, with x >= 0,
-ClassJavadoc GLES1  * as well as most of it's extensions defined at the time of this specification.
-ClassJavadoc GLES1  * </p>
+ClassJavadoc GLES1  * <p>This interface contains all OpenGL ES [ 1.0 .. 1.1 ] methods,
+ClassJavadoc GLES1  * as well as most of it's extensions defined at the time of this specification.</p>
 ClassJavadoc GLES1  */
 
 ClassJavadoc GLES2 /**
-ClassJavadoc GLES2  * <p> 
-ClassJavadoc GLES2  * This interface contains all core embedded OpenGL methods of ES 2.x, with x >= 0,
-ClassJavadoc GLES2  * inclusive, as well as most of it's extensions defined at the time of this specification.
-ClassJavadoc GLES2  * </p>
+ClassJavadoc GLES2  * <p>This interface contains all OpenGL ES 2.0 methods,
+ClassJavadoc GLES2  * as well as most of it's extensions defined at the time of this specification.</p>
 ClassJavadoc GLES2  */
 
 ClassJavadoc GLES3 /**
-ClassJavadoc GLES3  * <p> 
-ClassJavadoc GLES3  * This interface contains all core embedded OpenGL methods of ES 3.x, with x >= 0,
-ClassJavadoc GLES3  * inclusive, as well as most of it's extensions defined at the time of this specification.
-ClassJavadoc GLES3  * </p>
+ClassJavadoc GLES3  * <p>This interface contains all OpenGL ES 3.0 methods,
+ClassJavadoc GLES3  * as well as most of it's extensions defined at the time of this specification.</p>
 ClassJavadoc GLES3  */
 
 # Javadoc for the EGL class