Merge branch 'master' of ssh://[email protected]/jogl~jogl-git

1 files changed, 208 insertions, 176 deletions

diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 50c2ff004..4d3a05d63 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -1,6 +1,8 @@
 # This .cfg file provides common options used among all glue code
 # generated for Jogl on all platforms.
 
+HierarchicalNativeOutput false
+
 # Raise GLException instead of RuntimeException in glue code
 RuntimeExceptionType GLException
 UnsupportedExceptionType GLException
@@ -20,16 +22,15 @@ Import com.sun.opengl.impl.*
 # because we don't need them java-side. 
 Ignore GL_VERSION_.+
 
-# There are a few routines we don't handle yet
-Ignore glGetBufferPointerivNV
-Ignore glGetBufferPointerv
-
 # Ignore GL functions that deal with explicit pointer values in such a
 # way that we cannot implement the functionality in Java
 Ignore glGetBufferPointerv
 Ignore glGetBufferPointervARB
+Ignore glGetBufferPointerivNV
+Ignore glGetNamedBufferPointervEXT
 Ignore glGetPointerv
 Ignore glGetPointervEXT
+Ignore glGetPointerIndexedvEXT
 Ignore glGetTexParameterPointervAPPLE
 Ignore glGetVertexAttribPointerv
 Ignore glGetVertexAttribPointervARB
@@ -39,7 +40,6 @@ Ignore glTracePointerRangeMESA
 # Manually implement glMapBuffer as the size of the returned buffer
 # can only be computed by calling another routine
 ManuallyImplement glMapBuffer
-ManuallyImplement glMapBufferOES
 
 # Ignore the ATI_map_object_buffer extension for now unless someone
 # claims they need it, as it will undoubtedly require a similar
@@ -50,36 +50,6 @@ Ignore glUnmapObjectBufferATI
 # Ignore some GL functions that have outgoing void** parameters; we cannot yet deal with them
 Ignore glGetVariantPointervEXT
 
-# Don't output #defines of GL name strings as constants, because we
-# don't need them java-side. 
-# Format of name strings is found at:
-#    http://oss.sgi.com/projects/ogl-sample/registry/doc/template.txt
-
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_EXT_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_ARB_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_OES_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_PGI_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_SGI_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_SGIS_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_SGIX_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_MESA_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_HP_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_ATI_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_NV_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_IBM_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_WIN_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_REND_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_APPLE_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_INTEL_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_INGR_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_SUN_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_SUNX_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_3DFX_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_OML_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_I3D_.+
-Ignore (GL|GLU|GLX|WGL|AGL|CGL)_S3_.+
-Ignore GL_KTX_buffer_region
-
 # FIXME: these extensions require either a handle to a device context
 # or take void** parameters or both. Until we think through the
 # semantics of each of these individually we need to disable them.
@@ -133,6 +103,7 @@ IgnoreExtension GL_EXT_coordinate_frame
 # Ignore discontinued extensions
 IgnoreExtension GL_NV_element_array
 
+# >>> OpenGL 1.1
 # Ignore extensions subsumed in OpenGL 1.1 (from OpenGL 1.1 spec, Appendix C)
 IgnoreExtension GL_EXT_vertex_array
 IgnoreExtension GL_EXT_blend_logic_op
@@ -141,7 +112,9 @@ IgnoreExtension GL_EXT_polygon_offset
 IgnoreExtension GL_EXT_subtexture
 IgnoreExtension GL_EXT_texture
 IgnoreExtension GL_EXT_texture_object
+# <<< OpenGL 1.1
 
+# >>> OpenGL 1.2
 # Ignore extensions subsumed in OpenGL 1.2 and 1.2.1 (from OpenGL 1.2.1 spec, Appendix D)
 IgnoreExtension GL_EXT_bgra
 IgnoreExtension GL_EXT_blend_color
@@ -163,7 +136,9 @@ IgnoreExtension GL_SGI_color_matrix
 IgnoreExtension GL_SGI_color_table
 IgnoreExtension GL_SGIS_texture_edge_clamp
 IgnoreExtension GL_SGIS_texture_lod
+# <<< OpenGL 1.2
 
+# >>> OpenGL 1.3
 # Ignore extensions subsumed in OpenGL 1.3 (from OpenGL 1.3 spec, Appendix F)
 IgnoreExtension GL_ARB_multisample
 IgnoreExtension GL_ARB_multitexture
@@ -179,7 +154,9 @@ IgnoreExtension GL_EXT_texture_env_add
 IgnoreExtension GL_EXT_texture_env_combine
 IgnoreExtension GL_EXT_texture_env_dot3
 IgnoreExtension GL_SGIS_texture_border_clamp
+# <<< OpenGL 1.3
 
+# >>> OpenGL 1.4
 # Ignore extensions subsumed in OpenGL 1.4 (from OpenGL 1.4 spec, Appendix G)
 IgnoreExtension GL_ARB_depth_texture
 IgnoreExtension GL_ARB_point_parameters
@@ -195,29 +172,113 @@ IgnoreExtension GL_EXT_secondary_color
 IgnoreExtension GL_EXT_stencil_wrap
 IgnoreExtension GL_NV_blend_square
 IgnoreExtension GL_SGIS_generate_mipmap
+# <<< OpenGL 1.4
 
+# >>> OpenGL 1.5
 # Ignore extensions subsumed in OpenGL 1.5 (from OpenGL 1.5 spec, Appendix H)
 IgnoreExtension GL_ARB_occlusion_query
 IgnoreExtension GL_ARB_vertex_buffer_object
 IgnoreExtension GL_EXT_shadow_funcs
+# <<< OpenGL 1.5
 
+# >>> OpenGL 2.0
 # Ignore extensions subsumed in OpenGL 2.0 (from OpenGL 2.0 spec, Appendix I)
 # NOTE that GL_ARB_shader_objects is NOT ignored here, because the
 # naming convention is too different for us to pick up the entry
 # points automatically (e.g. glCreateShaderObjectARB was exposed as
 # glCreateShader)
+# IgnoreExtension GL_ARB_shader_objects
 IgnoreExtension GL_ARB_vertex_shader
 IgnoreExtension GL_ARB_fragment_shader
-IgnoreExtension GL_ARB_draw_buffers
 IgnoreExtension GL_ARB_texture_non_power_of_two
 IgnoreExtension GL_ARB_point_sprite
+IgnoreExtension GL_ARB_draw_buffers
 IgnoreExtension GL_EXT_blend_equation_separate
 # Don't ignore the following one since the entry point is different from anything in the core
 # IgnoreExtension GL_EXT_stencil_two_side
+# <<< OpenGL 2.0
 
+# >>> OpenGL 2.1
 # Ignore extensions subsumed in OpenGL 2.1 (from OpenGL 2.1 spec, Appendix J)
 IgnoreExtension GL_ARB_pixel_buffer_object
 IgnoreExtension GL_EXT_texture_sRGB
+# <<< OpenGL 2.1
+
+# >>> OpenGL 3.0
+# Ignore/Rename extensions subsumed in OpenGL 3.0 (from OpenGL 3.0 spec, Appendix N)
+RenameExtensionIntoCore GL_EXT_gpu_shader4
+
+RenameExtensionIntoCore GL_NV_conditional_render
+
+RenameExtensionIntoCore GL_APPLE_flush_buffer_range
+
+RenameExtensionIntoCore GL_ARB_color_buffer_float
+# gl.h uses GL_ARB_depth_buffer_float
+RenameExtensionIntoCore GL_ARB_depth_buffer_float
+IgnoreExtension GL_NV_depth_buffer_float
+RenameExtensionIntoCore GL_ARB_texture_float
+RenameExtensionIntoCore GL_EXT_packed_float
+RenameExtensionIntoCore GL_EXT_texture_shared_exponent
+
+# gl.h uses GL_ARB_framebuffer_object
+# GL_*_geometry_shader4 is included here, due to a naming collision otherwise.
+#    glFramebufferTextureLayerARB is ignored due to it's existence in GL_ARB_framebuffer_object and GL_ARB_geometry_shader4
+RenameExtensionIntoCore GL_ARB_framebuffer_object
+IgnoreExtension GL_EXT_framebuffer_object
+RenameExtensionIntoCore GL_ARB_geometry_shader4
+IgnoreExtension GL_EXT_geometry_shader4
+Ignore glFramebufferTextureLayerARB
+
+RenameExtensionIntoCore GL_NV_half_float
+RenameExtensionIntoCore GL_ARB_half_float_pixel
+
+RenameExtensionIntoCore GL_EXT_framebuffer_multisample
+RenameExtensionIntoCore GL_EXT_framebuffer_blit
+
+#Big gap of promoted tokens and functions: GL_EXT_texture_integer
+RenameExtensionIntoCore GL_EXT_texture_integer
+
+RenameExtensionIntoCore GL_EXT_texture_array
+
+RenameExtensionIntoCore GL_EXT_packed_depth_stencil
+
+RenameExtensionIntoCore GL_EXT_draw_buffers2
+
+# gl.h uses GL_ARB_texture_compression_rgtc
+RenameExtensionIntoCore GL_ARB_texture_compression_rgtc
+IgnoreExtension GL_EXT_texture_compression_rgtc
+
+RenameExtensionIntoCore GL_EXT_transform_feedback
+IgnoreExtension GL_NV_transform_feedback
+
+# gl.h uses GL_ARB_vertex_array_object
+RenameExtensionIntoCore GL_ARB_vertex_array_object
+IgnoreExtension GL_APPLE_vertex_array_object
+
+# gl.h uses GL_ARB_framebuffer_sRGB
+RenameExtensionIntoCore GL_ARB_framebuffer_sRGB
+IgnoreExtension GL_EXT_framebuffer_sRGB
+
+RenameExtensionIntoCore GL_ARB_map_buffer_range
+
+# <<< OpenGL 3.0
+
+# >>> OpenGL 3.1
+# Rename extension suffices (if exist) subsumed in OpenGL 3.1 (from OpenGL 3.1 spec, Appendix G.1)
+# We alias 3.1 subsumed extension even for GL2, due to the convenience of the common GL2GL3 profile!
+RenameExtensionIntoCore GL_ARB_draw_instanced
+IgnoreExtension GL_EXT_draw_instanced
+RenameExtensionIntoCore GL_ARB_copy_buffer
+RenameExtensionIntoCore GL_NV_primitive_restart
+RenameExtensionIntoCore GL_ARB_texture_buffer_object
+IgnoreExtension GL_EXT_texture_buffer_object
+# Actually GL_ARB_texture_rectangle, but let's be convenient
+RenameExtensionIntoCore GL_EXT_texture_rectangle
+IgnoreExtension GL_NV_texture_rectangle
+RenameExtensionIntoCore GL_ARB_uniform_buffer_object
+# <<< OpenGL 3.1
+
+
 
 # Ignore a few obsolete versions of extensions that have been subsumed into the core or ARB extensions
 IgnoreExtension GL_EXT_multisample
@@ -230,6 +291,7 @@ IgnoreExtension GL_EXT_texture_rectangle
 
 Opaque boolean GLboolean
 ReturnsString glGetString
+ReturnsString glGetStringi
 
 # Experimental: Only NIO function, no arrays ..
 # NIOOnly __ALL__
@@ -289,6 +351,14 @@ ReturnValueCapacity glXAllocateMemoryNV {0}
 # Pass arguments to ARB_vertex_program, ARB_fragment_program,
 # ARB_shader_objects, NV_vertex_program, NV_fragment_program, and
 # ARB_vertex_shader as Strings
+ArgumentIsString glBindAttribLocation 2
+ArgumentIsString glBindAttribLocationARB 2
+ArgumentIsString glGetAttribLocation 1
+ArgumentIsString glGetAttribLocationARB 1
+ArgumentIsString glGetProgramNamedParameterfvNV 2
+ArgumentIsString glGetProgramNamedParameterdvNV 2
+ArgumentIsString glGetUniformLocation 1
+ArgumentIsString glGetUniformLocationARB 1
 ArgumentIsString glLoadProgramNV 3
 ArgumentIsString glProgramString 3
 ArgumentIsString glProgramStringARB 3
@@ -296,16 +366,32 @@ ArgumentIsString glProgramNamedParameter4fNV 2
 ArgumentIsString glProgramNamedParameter4dNV 2
 ArgumentIsString glProgramNamedParameter4fvNV 2
 ArgumentIsString glProgramNamedParameter4dvNV 2
-ArgumentIsString glGetProgramNamedParameterfvNV 2
-ArgumentIsString glGetProgramNamedParameterdvNV 2
 ArgumentIsString glShaderSource 2
 ArgumentIsString glShaderSourceARB 2
-ArgumentIsString glGetUniformLocation 1
-ArgumentIsString glGetUniformLocationARB 1
-ArgumentIsString glBindAttribLocation 2
-ArgumentIsString glBindAttribLocationARB 2
-ArgumentIsString glGetAttribLocation 1
-ArgumentIsString glGetAttribLocationARB 1
+
+ArgumentIsString glBindFragDataLocation 2
+ArgumentIsString glGetFragDataLocation 1
+ArgumentIsString glGetUniformIndices 2
+ArgumentIsString glGetUniformBlockIndex 1
+ArgumentIsString glTransformFeedbackVaryings 2
+
+# String output values:
+#   ArgumentIsString glGetActiveAttrib 6
+#   ArgumentIsString glGetActiveUniformBlockName 4
+#   ArgumentIsString glGetActiveUniformName 4
+#   ArgumentIsString glGetActiveUniform 6
+#   ArgumentIsString glGetProgramInfoLog 3
+#   ArgumentIsString glGetShaderInfoLog 3
+#   ArgumentIsString glGetShaderSource 3
+#   ArgumentIsString glGetTransformFeedbackVarying 6
+
+#
+# Use cached GL_EXTENSION if possible,
+# which also allows GL3 compatibility.
+#
+JavaPrologue glGetString  if(GL.GL_EXTENSIONS==name && _context.isExtensionCacheInitialized()) {
+JavaPrologue glGetString    return _context.getGLExtensions();
+JavaPrologue glGetString  }
 
 #
 # Directives for Vertex Buffer Object and Pixel Buffer Object checking
@@ -481,70 +567,93 @@ RangeCheck glDeleteVertexArraysAPPLE  1 {0}
 
 # Javadoc for the GL class
 ClassJavadoc GL /**
-ClassJavadoc GL  * <P> The basic interface to OpenGL, providing access to core
-ClassJavadoc GL  * functionality up through the OpenGL 2.0 specification as well as
-ClassJavadoc GL  * all vendor extensions. </P>
-ClassJavadoc GL  *
-ClassJavadoc GL  * <P> While the APIs for vendor extensions are unconditionally
-ClassJavadoc GL  * exposed, the underlying functions may not be present. The method
-ClassJavadoc GL  * {@link #isFunctionAvailable} should be used to query the
-ClassJavadoc GL  * availability of any non-core function before it is used for the
-ClassJavadoc GL  * first time; for example,
-ClassJavadoc GL  * <code>gl.isFunctionAvailable("glProgramStringARB")</code>. On
-ClassJavadoc GL  * certain platforms (Windows in particular), the most "core"
-ClassJavadoc GL  * functionality is only OpenGL 1.1, so in theory any routines first
-ClassJavadoc GL  * exposed in OpenGL 1.2, 1.3, and 1.4, 1.5, or 2.0 as well as vendor
-ClassJavadoc GL  * extensions should all be queried. Calling an unavailable function
-ClassJavadoc GL  * will cause a {@link GLException} to be raised. </P>
-ClassJavadoc GL  *
-ClassJavadoc GL  * {@link #isExtensionAvailable} may also be used to determine whether
-ClassJavadoc GL  * a specific extension is available before calling the routines or
-ClassJavadoc GL  * using the functionality it exposes: for example,
-ClassJavadoc GL  * <code>gl.isExtensionAvailable("GL_ARB_vertex_program");</code>.
-ClassJavadoc GL  * However, in this case it is up to the end user to know which
-ClassJavadoc GL  * routines or functionality are associated with which OpenGL
-ClassJavadoc GL  * extensions. It may also be used to test for the availability of a
-ClassJavadoc GL  * particular version of OpenGL: for example,
-ClassJavadoc GL  * <code>gl.isExtensionAvailable("GL_VERSION_1_5");</code>.
-ClassJavadoc GL  *
-ClassJavadoc GL  * <P> Exceptions to the window system extension naming rules:
-ClassJavadoc GL  *
-ClassJavadoc GL  * <UL>
-ClassJavadoc GL  *
-ClassJavadoc GL  * <LI> The memory allocators for the NVidia vertex_array_range (VAR)
-ClassJavadoc GL  * extension, in particular <code>wglAllocateMemoryNV</code> /
-ClassJavadoc GL  * <code>glXAllocateMemoryNV</code> and associated routines. {@link
-ClassJavadoc GL  * #glAllocateMemoryNV} has been provided for window system-independent
-ClassJavadoc GL  * access to VAR. {@link #isFunctionAvailable} will translate an argument
-ClassJavadoc GL  * of "glAllocateMemoryNV" or "glFreeMemoryNV" into the appropriate
-ClassJavadoc GL  * window system-specific name. </P>
-ClassJavadoc GL  *
-ClassJavadoc GL  * <LI> WGL_ARB_pbuffer, WGL_ARB_pixel_format, and other
-ClassJavadoc GL  * platform-specific pbuffer functionality; the availability of
-ClassJavadoc GL  * pbuffers can be queried on Windows, X11 and Mac OS X platforms by
-ClassJavadoc GL  * querying {@link #isExtensionAvailable} with an argument of
-ClassJavadoc GL  * "GL_ARB_pbuffer" or "GL_ARB_pixel_format".
-ClassJavadoc GL  *
-ClassJavadoc GL  * </UL> <P>
-ClassJavadoc GL  *
+ClassJavadoc GL  * <P> Common interface containing the subset of all profiles, 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  */
+
+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  */
+
+ClassJavadoc GL2GL3 /**
+ClassJavadoc GL2GL3  * <P> 
+ClassJavadoc GL2GL3  * Interface containing the common subset of 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  * 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} OpenGL 3.1+ context to benefit
+ClassJavadoc GL2  * from new functionality and versions.
+ClassJavadoc GL2  * </P>
+ClassJavadoc GL2  */
+
+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  * 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  */
+
+ClassJavadoc GLES1 /**
+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  */
+
+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
+ClassJavadoc GLES2  * time of this specification.
+ClassJavadoc GLES2  * </P>
+ClassJavadoc GLES2  */
+
+# Javadoc for the EGL class
+ClassJavadoc EGL /**
+ClassJavadoc EGL  * Provides access to the embedded-specific OpenGL vendor extensions.
+ClassJavadoc EGL  * See {@link GLBase} for more information.
+ClassJavadoc EGL  */
+
 # Javadoc for the WGL class
 ClassJavadoc WGL /**
 ClassJavadoc WGL  * Provides access to the Windows-specific OpenGL vendor extensions.
-ClassJavadoc WGL  * See {@link GL} for more information.
+ClassJavadoc WGL  * See {@link GLBase} for more information.
 ClassJavadoc WGL  */
 
 # Javadoc for the GLX class
 ClassJavadoc GLX /**
 ClassJavadoc GLX  * Provides access to the X11-specific OpenGL vendor extensions.
-ClassJavadoc GLX  * See {@link GL} for more information.
+ClassJavadoc GLX  * See {@link GLBase} for more information.
 ClassJavadoc GLX  */
 
 # Javadoc for the CGL class
 ClassJavadoc CGL /**
 ClassJavadoc CGL  * Provides access to the MacOSX-specific OpenGL vendor extensions.
-ClassJavadoc CGL  * See {@link GL} for more information.
+ClassJavadoc CGL  * See {@link GLBase} for more information.
 ClassJavadoc CGL  */
 
 # Javadoc for the XVisualInfo class
@@ -556,86 +665,9 @@ ClassJavadoc XVisualInfo  */
 
 # Custom code for querying extensions and exposing
 # wglAllocateMemoryNV/glXAllocateMemoryNV
-CustomJavaCode GL   /**
-CustomJavaCode GL    * Returns true if the specified OpenGL core- or extension-function can be
-CustomJavaCode GL    * used successfully through this GL instance given the current host (OpenGL
-CustomJavaCode GL    * <i>client</i>) and display (OpenGL <i>server</i>) configuration.<P> 
-CustomJavaCode GL    * By "successfully" we mean that the function is both <i>callable</i> 
-CustomJavaCode GL    * on the machine running the program and <i>available</i> on the current 
-CustomJavaCode GL    * display.<P> 
-CustomJavaCode GL    *
-CustomJavaCode GL    * In order to call a function successfully, the function must be both
-CustomJavaCode GL    * <i>callable</i> on the machine running the program and <i>available</i> on 
-CustomJavaCode GL    * the display device that is rendering the output (note: on non-networked, 
-CustomJavaCode GL    * single-display machines these two conditions are identical; on networked and/or
-CustomJavaCode GL    * multi-display machines this becomes more complicated). These conditions are
-CustomJavaCode GL    * met if the function is either part of the core OpenGL version supported by
-CustomJavaCode GL    * both the host and display, or it is an OpenGL extension function that both
-CustomJavaCode GL    * the host and display support. <P>
-CustomJavaCode GL    *
-CustomJavaCode GL    * A GL function is <i>callable</i> if it is successfully linked at runtime,
-CustomJavaCode GL    * hence the GLContext must be made current at least once.
-CustomJavaCode GL    * 
-CustomJavaCode GL    * @param glFunctionName the name of the OpenGL function (e.g., use
-CustomJavaCode GL    * "glBindRenderbufferEXT" or "glBindRenderbuffer" to check if {@link
-CustomJavaCode GL    * #glBindRenderbuffer(int,int)} is available).
-CustomJavaCode GL    */
-CustomJavaCode GL   public boolean isFunctionAvailable(String glFunctionName);
-
-CustomJavaCode GL   /**
-CustomJavaCode GL    * Returns true if the specified OpenGL extension can be
-CustomJavaCode GL    * used successfully through this GL instance given the current host (OpenGL
-CustomJavaCode GL    * <i>client</i>) and display (OpenGL <i>server</i>) configuration.<P> 
-CustomJavaCode GL    *
-CustomJavaCode GL    * @param glExtensionName the name of the OpenGL extension (e.g.,
-CustomJavaCode GL    * "GL_ARB_vertex_program").
-CustomJavaCode GL    */
-CustomJavaCode GL   public boolean isExtensionAvailable(String glExtensionName);
-
-CustomJavaCode GL   /**
-CustomJavaCode GL    * Provides platform-independent access to the <code>wglAllocateMemoryNV</code> /
-CustomJavaCode GL    * <code>glXAllocateMemoryNV</code> extension.
-CustomJavaCode GL    */
-CustomJavaCode GL   public java.nio.ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3);
-
-CustomJavaCode GL   /** Provides a platform-independent way to specify the minimum swap
-CustomJavaCode GL       interval for buffer swaps. An argument of 0 disables
-CustomJavaCode GL       sync-to-vertical-refresh completely, while an argument of 1
-CustomJavaCode GL       causes the application to wait until the next vertical refresh
-CustomJavaCode GL       until swapping buffers. The default, which is platform-specific,
-CustomJavaCode GL       is usually either 0 or 1. This function is not guaranteed to
-CustomJavaCode GL       have an effect, and in particular only affects heavyweight
-CustomJavaCode GL       onscreen components. */
-CustomJavaCode GL   public void setSwapInterval(int interval);
-
-CustomJavaCode GL   /**
-CustomJavaCode GL    * Returns an object through which platform-specific OpenGL extensions
-CustomJavaCode GL    * (WGL, GLX, etc.) may be accessed. The data type of the returned
-CustomJavaCode GL    * object and its associated capabilities are undefined. Most
-CustomJavaCode GL    * applications will never need to call this method. It is highly
-CustomJavaCode GL    * recommended that any applications which do call this method perform
-CustomJavaCode GL    * all accesses on the returned object reflectively to guard
-CustomJavaCode GL    * themselves against changes to the implementation.
-CustomJavaCode GL    */
-CustomJavaCode GL   public Object getPlatformGLExtensions();
-
-CustomJavaCode GL   /**
-CustomJavaCode GL    * Returns an object providing access to the specified OpenGL
-CustomJavaCode GL    * extension. This is intended to provide a mechanism for vendors who
-CustomJavaCode GL    * which to provide access to new OpenGL extensions without changing
-CustomJavaCode GL    * the public API of the core package. For example, a user may request
-CustomJavaCode GL    * access to extension "GL_VENDOR_foo" and receive back an object
-CustomJavaCode GL    * which implements a vendor-specified interface which can call the
-CustomJavaCode GL    * OpenGL extension functions corresponding to that extension. It is
-CustomJavaCode GL    * up to the vendor to specify both the extension name and Java API
-CustomJavaCode GL    * for accessing it, including which class or interface contains the
-CustomJavaCode GL    * functions.
-CustomJavaCode GL    *
-CustomJavaCode GL    * <P>
-CustomJavaCode GL    *
-CustomJavaCode GL    * Note: it is the intent to add new extensions as quickly as possible
-CustomJavaCode GL    * to the core GL API. Therefore it is unlikely that most vendors will
-CustomJavaCode GL    * use this extension mechanism, but it is being provided for
-CustomJavaCode GL    * completeness.
-CustomJavaCode GL    */
-CustomJavaCode GL   public Object getExtension(String extensionName);
+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);
+