Bug 1135: Bump [html] doc to include GL 4.5, ES 3.1 and EGL [ 1.0 .. 1.5 ]

3 files changed, 35 insertions, 31 deletions

diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 1711d962e..84919e5e2 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -906,7 +906,7 @@ ClassJavadoc GL2ES2  */
 
 ClassJavadoc GL2ES3 /**
 ClassJavadoc GL2ES3  * <p> 
-ClassJavadoc GL2ES3  * Interface containing the common subset of core GL2 and GLES3 (OpenGL ES 3.0).<br/>
+ClassJavadoc GL2ES3  * Interface containing the common subset of core GL2 and GLES3 (OpenGL ES 3.0+).<br/>
 ClassJavadoc GL2ES3  * This interface reflects only the programmable shader functionality of desktop and embedded OpenGL<br/>
 ClassJavadoc GL2ES3  * This interface is not GLES3 complete and merely exist to avoid duplicated definitions.<br/>
 ClassJavadoc GL2ES3  * </p>
@@ -914,7 +914,7 @@ ClassJavadoc GL2ES3  */
 
 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  * 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, lacking <code>GL_ARB_ES3_compatibility</code> extension.<br/>
 ClassJavadoc GL3ES3  * </p>
@@ -922,7 +922,7 @@ ClassJavadoc GL3ES3  */
 
 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  * 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 w/o vendor extensions.<br/>
 ClassJavadoc GL4ES3  * </p>
@@ -960,15 +960,15 @@ ClassJavadoc GL3bc  * <p>Note: OpenGL [ 3.1 .. 3.3 ] compatibility profile does
 ClassJavadoc GL3bc  */
 
 ClassJavadoc GL4 /**
-ClassJavadoc GL4  * <p>This interface contains all OpenGL [ 4.0 .. 4.3 ] <i>core</i> methods,
+ClassJavadoc GL4  * <p>This interface contains all OpenGL [ 4.0 .. 4.5 ] <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  * <p>Note: OpenGL [ 4.0 .. 4.5 ] core profile does not includes fixed point functionality.</p>
 ClassJavadoc GL4  */
 
 ClassJavadoc GL4bc /**
-ClassJavadoc GL4bc  * <p>This interface contains all OpenGL [ 4.0 .. 4.3 ] <i>compatibility</i> profile,
+ClassJavadoc GL4bc  * <p>This interface contains all OpenGL [ 4.0 .. 4.5 ] <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  * <p>Note: OpenGL [ 4.0 .. 4.5 ] compatibility profile does includes fixed point functionality.</p>
 ClassJavadoc GL4bc  */
 
 ClassJavadoc GLES1 /**
@@ -982,7 +982,7 @@ ClassJavadoc GLES2  * as well as most of it's extensions defined at the time of
 ClassJavadoc GLES2  */
 
 ClassJavadoc GLES3 /**
-ClassJavadoc GLES3  * <p>This interface contains all OpenGL ES 3.0 methods,
+ClassJavadoc GLES3  * <p>This interface contains all OpenGL ES [ 3.0 .. 3.1 ] methods,
 ClassJavadoc GLES3  * as well as most of it's extensions defined at the time of this specification.</p>
 ClassJavadoc GLES3  */
 
diff --git a/make/doc/jogl/spec-overview.html b/make/doc/jogl/spec-overview.html
index a2c37e976..b4f5e1631 100644
--- a/make/doc/jogl/spec-overview.html
+++ b/make/doc/jogl/spec-overview.html
@@ -11,8 +11,9 @@
   This specification, an optional set of packages, describes the Java(TM)
 bindings to the native OpenGL(R) 3D graphics library profiles:
 <ul>
-    <li> OpenGL [ 1.0 .. 4.3 ], compatibility- and core profiles</li>
-    <li> OpenGL ES [ 1.0 .. 3.0 ]</li>
+    <li> OpenGL [ 1.0 .. 4.5 ], compatibility- and core profiles</li>
+    <li> OpenGL ES [ 1.0 .. 3.1 ]</li>
+    <li> EGL [ 1.0 .. 1.5 ]</li>
 </ul>
   <p><a href="#GLAPIInclusionCriteria">Inclusion Criteria</a> explains the OpenGL profile separation.</p>
   <p>See <a href="#GLRuntimeVersion">OpenGL Runtime Requirements</a>.</p>
@@ -49,7 +50,7 @@ bindings to the native OpenGL(R) 3D graphics library profiles:
 
 <h3>OpenGL Profile Model</h3>
   OpenGL today is not just a single set of functions, it offers many profiles for different
-  purposes, e.g. ES1, ES2 and ES3 for mobile, GL [ 3.1 .. 4.3 ] core for a programmable shader application, etc.
+  purposes, e.g. ES1, ES2 and ES3 for mobile, GL [ 3.1 .. 4.5 ] core for a programmable shader application, etc.
   <p>JOGL reflects these profiles <a href="http://jogamp.org/jogl/doc/uml/html/">with an OO abstraction model</a>,
   specifying interfaces encapsulating common subsets.</p> 
    
@@ -90,16 +91,16 @@ bindings to the native OpenGL(R) 3D graphics library profiles:
         </li>
 
         <li> {@link com.jogamp.opengl.GL4 com.jogamp.opengl.GL4} interface
-        <p>This interface contains all OpenGL [ 4.0 .. 4.3 ] <i>core</i> methods,
+        <p>This interface contains all OpenGL [ 4.0 .. 4.5 ] <i>core</i> methods,
         as well as most of it's extensions defined at the time of this specification.</p>
-        <p>Note: OpenGL [ 4.0 .. 4.3 ] core profile does not includes fixed point functionality.</p>
+        <p>Note: OpenGL [ 4.0 .. 4.5 ] core profile does not includes fixed point functionality.</p>
         <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p>
         </li>
 
         <li> {@link com.jogamp.opengl.GL4bc com.jogamp.opengl.GL4bc} interface
-        <p>This interface contains all OpenGL [ 4.0 .. 4.3 ] <i>compatibility</i> profile,
+        <p>This interface contains all OpenGL [ 4.0 .. 4.5 ] <i>compatibility</i> profile,
         as well as most of it's extensions defined at the time of this specification.</p>
-        <p>Note: OpenGL [ 4.0 .. 4.3 ] compatibility profile does includes fixed point functionality.</p>
+        <p>Note: OpenGL [ 4.0 .. 4.5 ] compatibility profile does includes fixed point functionality.</p>
         <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p>
         </li>
 
@@ -116,7 +117,7 @@ bindings to the native OpenGL(R) 3D graphics library profiles:
         </li>
 
         <li> {@link com.jogamp.opengl.GLES3 com.jogamp.opengl.GLES3} interface
-        <p>This interface contains all OpenGL ES 3.0 methods,
+        <p>This interface contains all OpenGL ES [ 3.0 .. 3.1 ] methods,
         as well as most of it's extensions defined at the time of this specification.</p>
         <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p>
         </li>
@@ -491,19 +492,19 @@ com.jogamp.opengl namespace via future maintenance updates to the API.
 <ul>
     <li><a href="http://www.khronos.org/registry/"><b>Khronos Registry</b></a>
       <ul>
-        <li><a href="http://www.khronos.org/opengles/sdk/docs/man3/">ES 3 Ref Pages</a></li>
-        <li><a href="http://www.khronos.org/registry/gles/specs/3.0/es_spec_3.0.2.pdf">ES 3.0 Spec</a></li>
-        <li><a href="http://www.khronos.org/registry/gles/specs/3.0/GLSL_ES_Specification_3.00.4.pdf">GLSL ES 3.00 Spec</a></li>
+        <li><a href="http://www.khronos.org/opengles/sdk/docs/man31/">ES 3.1 Ref Pages</a></li>
+        <li><a href="http://www.khronos.org/registry/gles/specs/3.1/es_spec_3.1.withchanges.pdf">ES 3.1 Spec</a></li>
+        <li><a href="http://www.khronos.org/registry/gles/specs/3.1/GLSL_ES_Specification_3.10.withchanges.pdf">GLSL ES 3.10 Spec</a></li>
         <li><a href="http://www.khronos.org/files/opengles3-quick-reference-card.pdf">ES 3.0 Ref Card</a></li>
       </ul></li>
     <li><a href="http://www.opengl.org/registry/"><b>OpenGL Registry</b></a>
       <ul>
         <li><a href="http://www.opengl.org/sdk/docs/man4/">GL 4 Ref Pages </a></li>
         <li><a href="http://www.opengl.org/sdk/docs/manglsl/">GLSL Ref Pages </a></li>
-        <li><a href="http://www.opengl.org/registry/doc/glspec43.core.20130214.withchanges.pdf">GL 4.3 Core Spec</a></li>
-        <li><a href="http://www.opengl.org/registry/doc/glspec43.compatibility.20130214.withchanges.pdf">GL 4.3 Compat. Spec</a></li>
-        <li><a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.30.8.pdf">GLSL 4.30 spec</a></li>
-        <li><a href="http://www.khronos.org/files/opengl43-quick-reference-card.pdf">GL 4.3 Ref Card</a></li>
+        <li><a href="http://www.opengl.org/registry/doc/glspec45.core.withchanges.pdf">GL 4.5 Core Spec</a></li>
+        <li><a href="http://www.opengl.org/registry/doc/glspec45.compatibility.withchanges.pdf">GL 4.5 Compat. Spec</a></li>
+        <li><a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.50.diff.pdf">GLSL 4.50 spec</a></li>
+        <li><a href="http://www.opengl.org/sdk/docs/reference_card/opengl45-reference-card.pdf">GL 4.5 Ref Card</a></li>
       </ul></li>
 </ul>
 
@@ -518,6 +519,7 @@ com.jogamp.opengl namespace via future maintenance updates to the API.
 <li> 2.0.0 Maintenance Release, July 2009</li>
 <li> 2.0.1 Java Dependency Update to 1.5, February 2011</li>
 <li> 2.0.2 Major Release, July 18th 2013</li>
+<li> 2.3.0 Major Release, March 11th 2015</li>
 </ul>
 </body>
 </html>
diff --git a/www/index.html b/www/index.html
index 787b43c61..5954c852b 100644
--- a/www/index.html
+++ b/www/index.html
@@ -39,20 +39,22 @@
                         <li><a href="../../git/?p=jogl.git">Code Repository</a></li>
                         <li><a href="../../git/?p=jogl-demos.git">Demo Repository</a></li>
                         <li><a href="http://www.khronos.org/registry/"><b>Khronos Registry</b></a></li>
-                            <li><a href="http://www.khronos.org/opengles/sdk/docs/man3/">ES 3 Ref Pages</a></li>
-                            <li><a href="http://www.khronos.org/registry/gles/specs/3.0/es_spec_3.0.2.pdf">ES 3.0 Spec</a></li>
-                            <li><a href="http://www.khronos.org/registry/gles/specs/3.0/GLSL_ES_Specification_3.00.4.pdf">GLSL ES 3.00 Spec</a></li>
+                            <li><a href="http://www.khronos.org/opengles/sdk/docs/man31/">ES 3.1 Ref Pages</a></li>
+                            <li><a href="http://www.khronos.org/registry/gles/specs/3.1/es_spec_3.1.withchanges.pdf">ES 3.1 Spec</a></li>
+                            <li><a href="http://www.khronos.org/registry/gles/specs/3.1/GLSL_ES_Specification_3.10.withchanges.pdf">GLSL ES 3.10 Spec</a></li>
                             <li><a href="http://www.khronos.org/files/opengles3-quick-reference-card.pdf">ES 3.0 Ref Card</a></li>
                         <li><a href="http://www.opengl.org/registry/"><b>OpenGL Registry</b></a></li>
                         <li><a href="http://www.opengl.org/sdk/docs/man4/">GL 4 Ref Pages </a></li>
                         <li><a href="http://www.opengl.org/sdk/docs/manglsl/">GLSL Ref Pages </a></li>
-                        <li><a href="http://www.opengl.org/registry/doc/glspec43.core.20130214.withchanges.pdf">GL 4.3 Core Spec</a></li>
-                        <li><a href="http://www.opengl.org/registry/doc/glspec43.compatibility.20130214.withchanges.pdf">GL 4.3 Compat. Spec</a></li>
-                        <li><a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.30.8.pdf">GLSL 4.30 spec</a></li>
-                        <li><a href="http://www.khronos.org/files/opengl43-quick-reference-card.pdf">GL 4.3 Ref Card</a></li>
+                        <li><a href="http://www.opengl.org/registry/doc/glspec45.core.withchanges.pdf">GL 4.5 Core Spec</a></li>
+                        <li><a href="http://www.opengl.org/registry/doc/glspec45.compatibility.withchanges.pdf">GL 4.5 Compat. Spec</a></li>
+                        <li><a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.50.diff.pdf">GLSL 4.50 spec</a></li>
+                        <li><a href="http://www.opengl.org/sdk/docs/reference_card/opengl45-reference-card.pdf">GL 4.5 Ref Card</a></li>
                     </ul>
                     <h3>Presentations</h3>
                     <ul>
+                        <li><a href="../../doc/siggraph2014/">Siggraph 2014</a></li>
+                        <li><a href="../../doc/fosdem2014/">Fosdem 2014</a></li>
                         <li><a href="../../doc/siggraph2013/">Siggraph 2013</a></li>
                         <li><a href="../../doc/fosdem2013/">Fosdem 2013</a></li>
                         <li><a href="../../doc/gpunurbs2011/graphicon2011-slides.pdf">NURBS @ GPU</a></li>
@@ -83,7 +85,7 @@
                         and is designed to provide hardware-supported 3D graphics to applications written in Java.
                     </p>
                     <p>
-                        JOGL provides full access to the APIs in the OpenGL [ 1.0 .. 4.3 ], ES 1, ES 2 and ES 3 specification
+                        JOGL provides full access to the APIs in the OpenGL [ 1.0 .. 4.5 ], ES [ 1.0 .. 3.1 ] and EGL [ 1.0 .. 1.5 ] specification
                         as well as nearly all vendor extensions.<br/>
                         <a href="../doc/Overview-OpenGL-Evolution-And-JOGL.html">OpenGL Evolution &amp; JOGL</a> 
                         and the <a href="/deployment/jogamp-next/javadoc/jogl/javadoc/overview-summary.html#overview_description">JOGL Specification</a>