10 files changed, 96 insertions, 28 deletions
diff --git a/make/config/jogl/gl-common-extensions.cfg b/make/config/jogl/gl-common-extensions.cfg
index e28ff43c8..1f294ee69 100644
--- a/make/config/jogl/gl-common-extensions.cfg
+++ b/make/config/jogl/gl-common-extensions.cfg
@@ -57,14 +57,15 @@ RenameExtensionIntoCore GL_ARB_point_sprite
 RenameExtensionIntoCore GL_OES_blend_equation_separate
 RenameExtensionIntoCore GL_OES_blend_func_separate
 RenameExtensionIntoCore GL_OES_blend_subtract
-RenameExtensionIntoCore GL_OES_compressed_paletted_texture
 RenameExtensionIntoCore GL_OES_depth24
 RenameExtensionIntoCore GL_OES_depth32
 RenameExtensionIntoCore GL_OES_framebuffer_object
 RenameExtensionIntoCore GL_OES_mapbuffer
+RenameExtensionIntoCore GL_OES_packed_depth_stencil
 RenameExtensionIntoCore GL_OES_point_sprite
 RenameExtensionIntoCore GL_OES_rgb8_rgba8
 RenameExtensionIntoCore GL_OES_read_format
+RenameExtensionIntoCore GL_OES_standard_derivatives
 RenameExtensionIntoCore GL_OES_stencil1
 RenameExtensionIntoCore GL_OES_stencil4
 RenameExtensionIntoCore GL_OES_stencil8
@@ -72,6 +73,7 @@ RenameExtensionIntoCore GL_OES_stencil_wrap
 RenameExtensionIntoCore GL_OES_texture_cube_map
 RenameExtensionIntoCore GL_OES_texture_half_float
 RenameExtensionIntoCore GL_OES_texture_mirrored_repeat
+RenameExtensionIntoCore GL_OES_vertex_type_10_10_10_2
 
 # The following extensions have some differences requiring us to
 # manually rename some symbols and leave others alone for best
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 3c413465e..4e72daa71 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -21,6 +21,8 @@ Import com.jogamp.opengl.impl.*
 # because we don't need them java-side. 
 Ignore GL_VERSION_.+
 
+Ignore KHRONOS_.+
+
 # Ignore GL functions that deal with explicit pointer values in such a
 # way that we cannot implement the functionality in Java
 Ignore glGetBufferPointerv
diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg
index 63905dfff..4543b7fd2 100644
--- a/make/config/jogl/gl-es1.cfg
+++ b/make/config/jogl/gl-es1.cfg
@@ -97,4 +97,4 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gles1.c
 Import javax.media.opengl.GLES1
 Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2
-Import com.jogamp.common.nio.Buffers;
+Import com.jogamp.common.nio.Buffers
diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg
index 14498d0b9..9caa3b7f7 100644
--- a/make/config/jogl/gl-es2.cfg
+++ b/make/config/jogl/gl-es2.cfg
@@ -22,6 +22,9 @@ Include gl-common.cfg
 Include gl-common-extensions.cfg
 Include gl2_es2-common.cfg
 
+RenameExtensionIntoCore GL_OES_texture_3D
+RenameExtensionIntoCore GL_OES_get_program_binary
+
 EmitProcAddressTable true
 ProcAddressTableClassName GLES2ProcAddressTable
 GetProcAddressTableExpr ((GLES2ProcAddressTable)_context.getGLProcAddressTable())
@@ -65,6 +68,7 @@ CustomCCode #define GL_GLEXT_PROTOTYPES
 
 CustomCCode /* Include the OpenGL headers */
 CustomCCode /* #define GL_APICALL __declspec(dllimport) */
+CustomCCode #include <GLES2/gl2.h>
 CustomCCode #include <GLES2/gl2ext.h>
 CustomCCode #include <stdlib.h>
 Include ../intptr.cfg
@@ -80,6 +84,6 @@ Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2
 Import javax.media.opengl.GLArrayData
 Import javax.media.opengl.GLUniformData
-Import com.jogamp.common.nio.Buffers;
+Import com.jogamp.common.nio.Buffers
 Import java.io.PrintStream
 
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
index 005b667ef..33105d5f0 100644
--- a/make/config/jogl/gl-gl4bc.cfg
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -100,5 +100,5 @@ Import javax.media.opengl.GL2
 Import javax.media.opengl.GL3
 Import javax.media.opengl.GL3bc
 Import javax.media.opengl.GL4
-Import com.jogamp.common.nio.Buffers;
+Import com.jogamp.common.nio.Buffers
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl.java b/make/config/jogl/gl-if-CustomJavaCode-gl.java
index 20657ef9f..1ff8b8e8e 100644
--- a/make/config/jogl/gl-if-CustomJavaCode-gl.java
+++ b/make/config/jogl/gl-if-CustomJavaCode-gl.java
@@ -10,8 +10,6 @@
   /** Common in ES1, GL2 and GL3 */
   public static final int GL_BLEND_SRC = 0x0BE1;
   /** Common in ES1, GL2 and GL3 */
-  public static final int GL_BUFFER_ACCESS = 0x88BB;
-  /** Common in ES1, GL2 and GL3 */
   public static final int GL_CLEAR = 0x1500;
   /** Common in ES1, GL2 and GL3 */
   public static final int GL_COLOR_LOGIC_OP = 0x0BF2;
@@ -20,10 +18,6 @@
   /** Common in ES1, GL2 and GL3 */
   public static final int GL_COPY_INVERTED = 0x150C;
   /** Common in ES1, GL2 and GL3 */
-  public static final int GL_DEPTH_COMPONENT24 = 0x81A6;
-  /** Common in ES1, GL2 and GL3 */
-  public static final int GL_DEPTH_COMPONENT32 = 0x81A7;
-  /** Common in ES1, GL2 and GL3 */
   public static final int GL_EQUIV = 0x1509;
   /** Common in ES1, GL2 and GL3 */
   public static final int GL_LINE_SMOOTH = 0x0B20;
@@ -58,12 +52,6 @@
   /** Common in ES1, GL2 and GL3 */
   public static final int GL_SMOOTH_POINT_SIZE_RANGE = 0x0B12;
   /** Common in ES1, GL2 and GL3 */
-  public static final int GL_STENCIL_INDEX1 = 0x8D46;
-  /** Common in ES1, GL2 and GL3 */
-  public static final int GL_STENCIL_INDEX4 = 0x8D47;
-  /** Common in ES1, GL2 and GL3 */
-  public static final int GL_WRITE_ONLY = 0x88B9;
-  /** Common in ES1, GL2 and GL3 */
   public static final int GL_XOR = 0x1506;
 
   public void glClearDepth( double depth );
diff --git a/make/config/jogl/gl-if-gl-ignores.cfg b/make/config/jogl/gl-if-gl-ignores.cfg
index 5deb828e6..94e26d856 100644
--- a/make/config/jogl/gl-if-gl-ignores.cfg
+++ b/make/config/jogl/gl-if-gl-ignores.cfg
@@ -1,7 +1,38 @@
 # FIXME: some of these definitions like the ARB_imaging subset should end up in the GL interface
-Ignore GL.+_NV
-Ignore GL.+_ATI
-Ignore GL.+_AMD
+
+#
+# remove all enums/funcs which are not subset of all GL profiles
+#
+
+DropUniqVendorExtensions AMD
+DropUniqVendorExtensions ANGLE
+DropUniqVendorExtensions ARM
+DropUniqVendorExtensions APPLE
+DropUniqVendorExtensions ATI
+DropUniqVendorExtensions IMG
+DropUniqVendorExtensions QCOM
+DropUniqVendorExtensions NV
+DropUniqVendorExtensions VIV
+
+IgnoreExtension GL_EXT_discard_framebuffer
+IgnoreExtension GL_OES_compressed_paletted_texture
+IgnoreExtension GL_OES_get_program_binary
+IgnoreExtension GL_OES_standard_derivatives
+# subsumed, so ignore the aliased ones
+IgnoreExtension GL_OES_vertex_type_10_10_10_2
+Ignore GL_UNSIGNED_INT_10_10_10_2
+Ignore GL_INT_10_10_10_2
+
+IgnoreExtension GL_OES_vertex_array_object
+IgnoreExtension GL_OES_texture_3D
+
+# isn't included in GL2
+Ignore GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET
+
+# includes GL_STATE_RESTORE, which hasn't the QCOM suffix
+IgnoreExtension GL_QCOM_extended_get
+Ignore GL_STATE_RESTORE
+
 Ignore GL_ACTIVE_ATTRIBUTE_MAX_LENGTH
 Ignore GL_ACTIVE_ATTRIBUTES
 Ignore GL_ACTIVE_UNIFORM_MAX_LENGTH
@@ -327,7 +358,6 @@ Ignore GL_TEXTURE_MATRIX
 Ignore GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES
 Ignore GL_TEXTURE_RECTANGLE_NV_OES
 Ignore GL_TEXTURE_STACK_DEPTH
-Ignore GL_UNSIGNED_INT
 Ignore GL_UNSIGNED_INT_10F_11F_11F_REV_EXT
 Ignore GL_VALIDATE_STATUS
 Ignore GL_VERTEX_ARRAY
diff --git a/make/config/jogl/gl-if-gl.cfg b/make/config/jogl/gl-if-gl.cfg
index c57565b33..2f7932b67 100644
--- a/make/config/jogl/gl-if-gl.cfg
+++ b/make/config/jogl/gl-if-gl.cfg
@@ -16,10 +16,6 @@ Include gl-if-gl4-ignores.cfg
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl
 
-Import javax.media.opengl.GLES1
-Import javax.media.opengl.GLES2
-Import javax.media.opengl.GL2
-
 # Ignore all ES 2.X only stuff ..
 Ignore ^gl.*x
 Ignore ^gl.*xOES
diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg
index 6fe6b4b90..2aaee0620 100644
--- a/make/config/jogl/gl-if-gl2_es1.cfg
+++ b/make/config/jogl/gl-if-gl2_es1.cfg
@@ -22,6 +22,20 @@ JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl
 
 # Ignore all ES 1.X only stuff not in GL2
+DropUniqVendorExtensions AMD
+DropUniqVendorExtensions ANGLE
+DropUniqVendorExtensions ARM
+DropUniqVendorExtensions APPLE
+DropUniqVendorExtensions ATI
+DropUniqVendorExtensions IMG
+DropUniqVendorExtensions QCOM
+DropUniqVendorExtensions NV
+DropUniqVendorExtensions VIV
+
+IgnoreExtension GL_EXT_discard_framebuffer
+IgnoreExtension GL_OES_compressed_paletted_texture
+IgnoreExtension GL_OES_vertex_array_object
+
 IgnoreExtension GL_OES_compressed_ETC1_RGB8_texture
 IgnoreExtension GL_OES_draw_texture
 IgnoreExtension GL_OES_fixed_point
@@ -29,6 +43,13 @@ IgnoreExtension GL_OES_matrix_get
 IgnoreExtension GL_OES_point_size_array
 IgnoreExtension GL_OES_query_matrix
 IgnoreExtension GL_OES_vertex_half_float
+
+# isn't included in GL2
+# includes GL_STATE_RESTORE, which hasn't the QCOM suffix
+IgnoreExtension GL_QCOM_extended_get
+Ignore GL_STATE_RESTORE
+Ignore GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET
+
 Ignore glGetFixedv
 
 # Ignore OES variants of single precision floating point routines
diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg
index eedb5751d..a466ea5dd 100644
--- a/make/config/jogl/gl-if-gl2_es2.cfg
+++ b/make/config/jogl/gl-if-gl2_es2.cfg
@@ -1,22 +1,47 @@
 # This .cfg file is used to generate the GL interface and implementing class.
+JavaOutputDir gensrc/classes
+NativeOutputDir gensrc/native/jogl
+
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
+
 Package javax.media.opengl
 Style InterfaceOnly
 JavaClass GL2ES2
 Extends GL2ES2 GLBase
 Extends GL2ES2 GL
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
 HierarchicalNativeOutput false
 Include gl-common.cfg
 Include gl-common-extensions.cfg
 Include gl-if-gl3-ignores.cfg
 Include gl-if-gl4-ignores.cfg
 
-JavaOutputDir gensrc/classes
-NativeOutputDir gensrc/native/jogl
+RenameExtensionIntoCore GL_OES_texture_3D
+RenameExtensionIntoCore GL_OES_get_program_binary
 
 # Ignore all ES 2.X only stuff ..
+DropUniqVendorExtensions AMD
+DropUniqVendorExtensions ANGLE
+DropUniqVendorExtensions ARM
+DropUniqVendorExtensions APPLE
+DropUniqVendorExtensions ATI
+DropUniqVendorExtensions IMG
+DropUniqVendorExtensions QCOM
+DropUniqVendorExtensions NV
+DropUniqVendorExtensions VIV
+
+IgnoreExtension GL_EXT_discard_framebuffer
+IgnoreExtension GL_OES_compressed_paletted_texture
+IgnoreExtension GL_OES_compressed_ETC1_RGB8_texture
+IgnoreExtension GL_OES_vertex_array_object
+
+# isn't included in GL2
+# includes GL_STATE_RESTORE, which hasn't the QCOM suffix
+IgnoreExtension GL_QCOM_extended_get
+Ignore GL_STATE_RESTORE
+Ignore GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET
+
 # Ignore ^gl.*x(v)?(OES)?
 Ignore glEGL.*
 #Ignore glFramebufferVertexAttribArrayNV