diff options
author | Sven Gothel <[email protected]> | 2018-01-15 08:47:31 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2018-01-15 08:47:31 +0100 |
commit | f8b4aeff223be3d1766320e43f4cbe8420c393b5 (patch) | |
tree | 61f7d4290fd06acc8b18d148809d61aad1556b99 | |
parent | e2bd4af7e7f9131de987af4df6db1cd1d0e85878 (diff) | |
parent | 0d2abcd9b556cabdaaaa36d0c1465d3d1f4f0808 (diff) |
Merge remote-tracking branch 'remotes/xranby/www'
-rw-r--r-- | make/config/jogl/gl-common.cfg | 2 | ||||
-rw-r--r-- | make/doc/jogl/spec-overview.html | 4 | ||||
-rw-r--r-- | www/index.html | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index 2396f86a1..be4d9c44e 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -1018,7 +1018,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 .. 3.1 ] methods, +ClassJavadoc GLES3 * <p>This interface contains all OpenGL ES [ 3.0 .. 3.2 ] 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 b4f5e1631..879eda170 100644 --- a/make/doc/jogl/spec-overview.html +++ b/make/doc/jogl/spec-overview.html @@ -12,7 +12,7 @@ bindings to the native OpenGL(R) 3D graphics library profiles: <ul> <li> OpenGL [ 1.0 .. 4.5 ], compatibility- and core profiles</li> - <li> OpenGL ES [ 1.0 .. 3.1 ]</li> + <li> OpenGL ES [ 1.0 .. 3.2 ]</li> <li> EGL [ 1.0 .. 1.5 ]</li> </ul> <p><a href="#GLAPIInclusionCriteria">Inclusion Criteria</a> explains the OpenGL profile separation.</p> @@ -117,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 .. 3.1 ] methods, + <p>This interface contains all OpenGL ES [ 3.0 .. 3.2 ] 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> diff --git a/www/index.html b/www/index.html index 99582a19e..9d3099b5c 100644 --- a/www/index.html +++ b/www/index.html @@ -39,10 +39,10 @@ <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/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.khronos.org/opengles/sdk/docs/man32/">ES 3.2 Ref Pages</a></li> + <li><a href="http://www.khronos.org/registry/gles/specs/3.2/es_spec_3.2.withchanges.pdf">ES 3.2 Spec</a></li> + <li><a href="http://www.khronos.org/registry/gles/specs/3.2/GLSL_ES_Specification_3.20.withchanges.pdf">GLSL ES 3.20 Spec</a></li> + <li><a href="https://www.khronos.org/files/opengles32-quick-reference-card.pdf">ES 3.2 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> @@ -85,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.5 ], ES [ 1.0 .. 3.1 ] and EGL [ 1.0 .. 1.5 ] specification + JOGL provides full access to the APIs in the OpenGL [ 1.0 .. 4.5 ], ES [ 1.0 .. 3.2 ] 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 & JOGL</a> and the <a href="/deployment/jogamp-next/javadoc/jogl/javadoc/overview-summary.html#overview_description">JOGL Specification</a> |