Add Support for GL 4.3 (Bug 716) and ES 3.0 (Bug 717)

ES3 / GL4.3:

- Update all EGL, GLX, WGL and GL (desktop and mobile) khronos headers to latest version.
  - GL3/gl3* -> GL/glcorearb*

  - Explicitly preserve ES2_compatibility and ES3_compatibility in header,
    most extension grouping was removed in new headers.

  - Always load all GLHeader to ensure proper extension association across all profiles.

  - Unified method signatures

  - Added GL_EXT_map_buffer_range to core

  - Using common 'glMapBufferImpl(..)' for all glMapBuffer(..) and glMapBufferRange(..) impl.

  - Init necessary fields of GL instances via 'finalizeInit()' called by reflection, if exist.
    This allows removing initialization checks, i.e. for all buffer validations.

- BuildStaticGLInfo: Can handle new GL header structure, i.e. one CPP extenstion block incl. define + funcs.

- GLJavaMethodBindingEmitter: Simply print the

- No GL duplication due to new intermediate interfaces, see below

- OO lineare inheritance (Added GL2ES3, GL3ES3 and GL4ES3 intemediates):
  GLBase - GL - GL2ES2 - GLES2
  GLBase - GL - GL2ES2 - GL2GL3 - [ GL2, GL3 ]
  GLBase - GL - GL2ES2 - GL2ES3 - GL3ES3 - [ GL3 ]
  GLBase - GL - GL2ES2 - GL2ES3 - GL3ES3 - GL4ES3 - [ GLES3, GL4, .. ]

- Expose 'usable' intermediate interfaces GL3ES3 and GL4ES3 in GLBase/GLProfile/GLContext
  via is*() and get*().

- GLContext*:
  - isGL3core() is true if [ GL4, GL3, GLES3 ] (added GLES3)

  - Added ctxProfile argument to allow handling ES versions:
    - getMaxMajor(..), getMaxMinor(..), isValidGLVersion(..) and decrementGLVersion(..)
    - mapGLVersions(..) prepared for ES ARB/KHR validation

  - EGLContext checks ES3 (via old ctx's GL_VERSION)

- ExtensionAvailabilityCache adds GL_ES_Version_X_Y for ES.

- Prelim tests w/ Mesa 9.1.3
  GL Version     3.0 (ES profile, ES2 compat, ES3 compat, FBO, hardware) - OpenGL ES 3.0 Mesa 9.1.3 [GL 3.0.0, vendor 9.1.3 (Mesa 9.1.3)]

- TODO:
  - Use KHR_create_context in EGLContext.createContextARBImpl(..)
  - More tests (Mobile, ..)

+++

Misc:

- GLContext*:
  - Complete glAllocateMemoryNV w/ glFreeMemoryNV.

1 files changed, 119 insertions, 54 deletions

diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index ad0b7d1d0..ddb312075 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -7,6 +7,19 @@ HierarchicalNativeOutput false
 RuntimeExceptionType GLException
 UnsupportedExceptionType GLException
 
+# Inform the glue code generator of the association between #defines
+# and functions and the extensions in which they are defined
+GLHeader GL/gl.h
+GLHeader GL/glext.h
+GLHeader GL/glcorearb.h
+GLHeader GL/glcorearbext.h
+GLHeader GLES/gl.h
+GLHeader GLES/glext.h
+GLHeader GLES2/gl2.h
+GLHeader GLES2/gl2ext.h
+GLHeader GLES3/gl3.h
+GLHeader GLES3/gl3ext.h
+
 # Imports needed by all glue code
 Import java.util.*
 Import javax.media.opengl.*
@@ -37,13 +50,17 @@ Ignore glGetVertexAttribPointerv
 Ignore glGetVertexAttribPointervARB
 Ignore glGetVertexAttribPointervNV
 Ignore glTracePointerRangeMESA 
-Ignore glDebugMessageCallbackARB
 Ignore glDebugMessageCallbackAMD
+Ignore glDebugMessageCallbackARB
+Ignore glDebugMessageCallbackKHR
+Ignore glDebugMessageCallback
 
-# Manually implement glMapBuffer as the size of the returned buffer
+# Manually implement glMapBuffer and glMapBufferRange as the size of the returned buffer
 # can only be computed by calling another routine
 ManuallyImplement glMapBuffer
 ForceProcAddressGen glMapBuffer
+ManuallyImplement glMapBufferRange
+ForceProcAddressGen glMapBufferRange
 
 # Ignore the ATI_map_object_buffer extension for now unless someone
 # claims they need it, as it will undoubtedly require a similar
@@ -249,7 +266,7 @@ RenameExtensionIntoCore GL_EXT_draw_buffers2
 RenameExtensionIntoCore GL_ARB_texture_compression_rgtc
 IgnoreExtension GL_EXT_texture_compression_rgtc
 
-RenameExtensionIntoCore GL_EXT_transform_feedback
+IgnoreExtension GL_EXT_transform_feedback
 IgnoreExtension GL_NV_transform_feedback
 
 # gl.h uses GL_ARB_vertex_array_object
@@ -277,6 +294,8 @@ IgnoreExtension GL_EXT_texture_buffer_object
 RenameExtensionIntoCore GL_EXT_texture_rectangle
 IgnoreExtension GL_NV_texture_rectangle
 RenameExtensionIntoCore GL_ARB_uniform_buffer_object
+# Use Manual definition, otherwise GlueGen uses 'long' type
+Ignore GL_INVALID_INDEX
 # <<< OpenGL 3.1
 
 # >>> OpenGL 3.2
@@ -339,6 +358,17 @@ RenameExtensionIntoCore GL_ARB_viewport_array
 # Rename extension suffices (if exist) subsumed in OpenGL 4.2 (from OpenGL 4.2 spec, Appendix L.1)
 # <<< OpenGL 4.2
 
+# >>> OpenGL 4.3
+# Rename extension suffices (if exist) subsumed in OpenGL 4.3 (from OpenGL 4.3 spec, Appendix ?.1)
+RenameExtensionIntoCore GL_ARB_debug_output
+# <<< OpenGL 4.3
+
+# >>> OpenGL ES 2.0
+# <<< OpenGL ES 2.0
+
+# >>> OpenGL ES 3.0
+# <<< OpenGL ES 3.0
+
 # Ignore a few obsolete versions of extensions that have been subsumed into the core or ARB extensions
 IgnoreExtension GL_EXT_multisample
 IgnoreExtension GL_EXT_point_parameters
@@ -352,6 +382,8 @@ IgnoreExtension GL_EXT_shader_image_load_store
 Opaque boolean GLboolean
 Opaque long GLsync
 Opaque long GLeglImageOES
+Opaque long cl_context
+Opaque long cl_event
 ReturnsString glGetString
 ReturnsString glGetStringi
 
@@ -421,9 +453,6 @@ NIODirectOnly glExtGetBufferPointervQCOM
 ReturnValueCapacity wglAllocateMemoryNV {0}
 ReturnValueCapacity glXAllocateMemoryNV {0}
 
-ReturnValueCapacity glMapBufferRange {2}
-ReturnValueCapacity glMapNamedBufferRangeEXT {2}
-
 # Pass arguments to ARB_vertex_program, ARB_fragment_program,
 # ARB_shader_objects, NV_vertex_program, NV_fragment_program, and
 # ARB_vertex_shader as Strings
@@ -473,7 +502,7 @@ ArgumentIsString glGetFragDataIndex 1
 ArgumentIsString glGetSubroutineIndex 2
 ArgumentIsString glGetSubroutineUniformLocation 2
 
-ArgumentIsString glDebugMessageInsertARB  5
+ArgumentIsString glDebugMessageInsert  5
 ArgumentIsString glDebugMessageInsertAMD  4
 
 ArgumentIsString glNamedStringARB 2 4
@@ -702,78 +731,122 @@ RangeCheck glDeleteVertexArraysAPPLE  1 {0}
 
 # Javadoc for the GL class
 ClassJavadoc GL /**
-ClassJavadoc GL  * <P> Common interface containing the subset of all profiles, GL3bc, GL3, GL2, GLES1 and GLES2.<br>
-ClassJavadoc GL  * This interface reflects common data types, texture and framebuffer functionality.</P>
+ClassJavadoc GL  * <p> Common interface containing the subset of all profiles, GL3bc, GL3, GL2, GLES1 and GLES2.<br/>
+ClassJavadoc GL  * This interface reflects common data types, texture and framebuffer functionality.</p>
 ClassJavadoc GL  */
 
 ClassJavadoc GL2ES1 /**
-ClassJavadoc GL2ES1  * <P> 
-ClassJavadoc GL2ES1  * Interface containing the common subset of GL2 and GLES1.<br>
-ClassJavadoc GL2ES1  * This interface reflects only the fixed functionality of OpenGL<br>
-ClassJavadoc GL2ES1  * </P>
+ClassJavadoc GL2ES1  * <p> 
+ClassJavadoc GL2ES1  * Interface containing the common subset of GL2 and GLES1.<br/>
+ClassJavadoc GL2ES1  * This interface reflects only the fixed functionality of OpenGL<br/>
+ClassJavadoc GL2ES1  * </p>
 ClassJavadoc GL2ES1  */
 
 ClassJavadoc GL2ES2 /**
-ClassJavadoc GL2ES2  * <P> 
-ClassJavadoc GL2ES2  * Interface containing the common subset of GL3, GL2 and GLES2.<br>
-ClassJavadoc GL2ES2  * This interface reflects only the programmable shader functionality of desktop and embedded OpenGL<br>
-ClassJavadoc GL2ES2  * </P>
+ClassJavadoc GL2ES2  * <p> 
+ClassJavadoc GL2ES2  * Interface containing the common subset of GL3, GL2 and GLES2.<br/>
+ClassJavadoc GL2ES2  * This interface reflects only the programmable shader functionality of desktop and embedded OpenGL<br/>
+ClassJavadoc GL2ES2  * This interface is almost GLES2 complete.<br/>
+ClassJavadoc GL2ES2  * </p>
 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  * 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>
+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  * 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  * </p>
+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  * This interface reflects only the programmable shader functionality of desktop and embedded OpenGL<br/>
+ClassJavadoc GL4ES3  * This interface is GLES3 complete.<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  * 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>
+ClassJavadoc GL2GL3  * <p> 
+ClassJavadoc GL2GL3  * Interface containing the common subset of core GL3 (OpenGL 3.1) and GL2 (OpenGL 3.0), 
+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>
 ClassJavadoc GL2GL3  */
 
 ClassJavadoc GL2 /**
-ClassJavadoc GL2  * <P> 
+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  * 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  * </P>
+ClassJavadoc GL2  * </p>
 ClassJavadoc GL2  */
 
-ClassJavadoc GL3bc /**
-ClassJavadoc GL3bc  * <P> 
-ClassJavadoc GL3bc  * This interface contains the OpenGL 3.x compatibility profile, ie includes all methods
-ClassJavadoc GL3bc  * as defined in {@link GL2} and {@link GL3}.<br>
-ClassJavadoc GL3bc  * </P>
-ClassJavadoc GL3bc  */
-
 ClassJavadoc GL3 /**
-ClassJavadoc GL3  * <P> 
-ClassJavadoc GL3  * This interface contains all core, forward compatible, OpenGL methods starting from 3.1,
-ClassJavadoc GL3  * inclusive, as well as most of it's extensions defined at the time of this specification.<br>
+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 no more includes fixed point functionality.
-ClassJavadoc GL3  * </P>
+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  */
 
+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  */
+
+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  */
+
+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  */
+
 ClassJavadoc GLES1 /**
-ClassJavadoc GLES1  * <P> 
+ClassJavadoc GLES1  * <p> 
 ClassJavadoc GLES1  * This interface contains all core embedded OpenGL methods of ES 1.x, with x >= 0,
-ClassJavadoc GLES1  * inclusive, as well as most of it's extensions defined at the
-ClassJavadoc GLES1  * time of this specification.
-ClassJavadoc GLES1  * </P>
+ClassJavadoc GLES1  * as well as most of it's extensions defined at the time of this specification.
+ClassJavadoc GLES1  * </p>
 ClassJavadoc GLES1  */
 
 ClassJavadoc GLES2 /**
-ClassJavadoc GLES2  * <P> 
+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
-ClassJavadoc GLES2  * time of this specification.
-ClassJavadoc GLES2  * </P>
+ClassJavadoc GLES2  * inclusive, as well as most of it's extensions defined at the time of this specification.
+ClassJavadoc GLES2  * </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  */
+
 # Javadoc for the EGL class
 ClassJavadoc EGL /**
 ClassJavadoc EGL  * Provides access to the embedded-specific OpenGL vendor extensions.
@@ -805,11 +878,3 @@ ClassJavadoc XVisualInfo  * extensions. No other access is provided to these dat
 ClassJavadoc XVisualInfo  * this wrapper is not useful to end users, though it is used in the implementation.
 ClassJavadoc XVisualInfo  */
 
-# Custom code for querying extensions and exposing
-# wglAllocateMemoryNV/glXAllocateMemoryNV
-CustomJavaCode GL2GL3   /**
-CustomJavaCode GL2GL3    * Provides platform-independent access to the <code>wglAllocateMemoryNV</code> /
-CustomJavaCode GL2GL3    * <code>glXAllocateMemoryNV</code> extension.
-CustomJavaCode GL2GL3    */
-CustomJavaCode GL2GL3   public java.nio.ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3);
-