OpenGL EGL, ES1 and ES2 Header Sync incl. subsuming common extensions.

- New EGL/ES headers from 2012-01-xx

- Subsuming ES extensions to core,
  allowing aliasing of more enums/funcs to GL or GL2ES1/GL2ES2:
    GL_EXT_color_buffer_half_float
    GL_EXT_occlusion_query_boolean
    GL_EXT_robustness
    GL_ARB_robustness
    GL_EXT_separate_shader_objects
    GL_EXT_shadow_samplers
    GL_EXT_sRGB
    GL_EXT_texture_array
    GL_EXT_texture_rg
    GL_EXT_texture_type_2_10_10_10_REV
    GL_NV_draw_buffers
    GL_NV_fbo_color_attachments
    GL_EXT_packed_float
    GL_EXT_texture_storage

15 files changed, 202 insertions, 24 deletions

diff --git a/make/config/jogl/gl-common-extensions.cfg b/make/config/jogl/gl-common-extensions.cfg
index 1f294ee69..194d45346 100644
--- a/make/config/jogl/gl-common-extensions.cfg
+++ b/make/config/jogl/gl-common-extensions.cfg
@@ -48,7 +48,6 @@ IgnoreExtension GL_NV_vertex_program
 IgnoreExtension GL_NV_present_video
 
 # For the time being, ignore these extensions which are in the ES 2.0 spec
-IgnoreExtension GL_NV_coverage_sample
 IgnoreExtension GL_NV_framebuffer_vertex_attrib_array
 
 # Remove extension suffixes from extensions which are common between OpenGL and OpenGL ES
@@ -74,6 +73,38 @@ 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
+RenameExtensionIntoCore GL_EXT_color_buffer_half_float
+RenameExtensionIntoCore GL_EXT_occlusion_query_boolean
+RenameExtensionIntoCore GL_EXT_robustness
+RenameExtensionIntoCore GL_ARB_robustness
+RenameExtensionIntoCore GL_EXT_separate_shader_objects
+RenameExtensionIntoCore GL_EXT_shadow_samplers
+RenameExtensionIntoCore GL_EXT_sRGB
+RenameExtensionIntoCore GL_EXT_texture_array
+RenameExtensionIntoCore GL_EXT_texture_rg
+RenameExtensionIntoCore GL_EXT_texture_type_2_10_10_10_REV
+RenameExtensionIntoCore GL_NV_draw_buffers
+RenameExtensionIntoCore GL_NV_fbo_color_attachments
+RenameExtensionIntoCore GL_EXT_packed_float
+
+# A mess w/ the ES2 definition .. sadly
+# RenameExtensionIntoCore GL_EXT_texture_storage
+RenameJavaSymbol glTexStorage1DEXT glTexStorage1D
+RenameJavaSymbol glTexStorage2DEXT glTexStorage2D
+RenameJavaSymbol glTexStorage3DEXT glTexStorage3D
+RenameJavaSymbol GL_TEXTURE_IMMUTABLE_FORMAT_EXT GL_TEXTURE_IMMUTABLE_FORMAT
+RenameJavaSymbol GL_RGBA32F_EXT                  GL_RGBA32F
+RenameJavaSymbol GL_RGB32F_EXT                   GL_RGB32F
+RenameJavaSymbol GL_ALPHA32F_EXT                 GL_ALPHA32F_ARB
+RenameJavaSymbol GL_LUMINANCE32F_EXT             GL_LUMINANCE32F_ARB
+RenameJavaSymbol GL_LUMINANCE_ALPHA32F_EXT       GL_LUMINANCE_ALPHA32F_ARB
+RenameJavaSymbol GL_RGB16F_EXT                   GL_RGB16F
+RenameJavaSymbol GL_ALPHA16F_EXT                 GL_ALPHA16F_ARB
+RenameJavaSymbol GL_LUMINANCE16F_EXT             GL_LUMINANCE16F_ARB
+RenameJavaSymbol GL_LUMINANCE_ALPHA16F_EXT       GL_LUMINANCE_ALPHA16F_ARB
+RenameJavaSymbol GL_RGB10_A2_EXT                 GL_RGB10_A2
+RenameJavaSymbol GL_RGB10_EXT                    GL_RGB10
+
 
 # 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 026b25695..046ff1a79 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -232,7 +232,9 @@ IgnoreExtension GL_EXT_framebuffer_object
 RenameExtensionIntoCore GL_NV_half_float
 RenameExtensionIntoCore GL_ARB_half_float_pixel
 
-RenameExtensionIntoCore GL_EXT_framebuffer_multisample
+# naming collision w/ GL_EXT_multisampled_render_to_texture, but included anyways
+# RenameExtensionIntoCore GL_EXT_framebuffer_multisample 
+IgnoreExtension GL_EXT_framebuffer_multisample 
 RenameExtensionIntoCore GL_EXT_framebuffer_blit
 
 #Big gap of promoted tokens and functions: GL_EXT_texture_integer
diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-if-CustomJavaCode-gl2_es2.java
index 1599a89ca..4522d34c8 100644
--- a/make/config/jogl/gl-if-CustomJavaCode-gl2_es2.java
+++ b/make/config/jogl/gl-if-CustomJavaCode-gl2_es2.java
@@ -1,3 +1,5 @@
+  /** Part of <code>GL_ARB_separate_shader_objects</code>, <code>GL_EXT_separate_shader_objects</code> */
+  public static final int GL_ALL_SHADER_BITS = 0xFFFFFFFF ;
 
   /** Start: GL_ARB_ES2_compatibility functions, which are part of ES2 core as well */
 
diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java b/make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java
index e7351076b..97fd6c4a6 100644
--- a/make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java
+++ b/make/config/jogl/gl-if-CustomJavaCode-gl2_gl3.java
@@ -5,9 +5,6 @@ public static final int GL_INVALID_INDEX = 0xFFFFFFFF ;
 /** Part of <code>GL_ARB_sync</code> */
 public static final long GL_TIMEOUT_IGNORED = 0xFFFFFFFFFFFFFFFFL ;
 
-/** Part of <code>GL_ARB_separate_shader_objects</code> */
-public static final int GL_ALL_SHADER_BITS = 0xFFFFFFFF ;
-
 /** Part of <code>GL_ARB_shader_image_load_store</code> */
 public static final int GL_ALL_BARRIER_BITS = 0xFFFFFFFF ;
 
diff --git a/make/config/jogl/gl-if-gl-ignores.cfg b/make/config/jogl/gl-if-gl-ignores.cfg
index 94e26d856..220bd74bf 100644
--- a/make/config/jogl/gl-if-gl-ignores.cfg
+++ b/make/config/jogl/gl-if-gl-ignores.cfg
@@ -18,13 +18,140 @@ 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_EXT_texture_type_2_10_10_10_REV
+IgnoreExtension GL_EXT_color_buffer_half_float
+IgnoreExtension GL_EXT_occlusion_query_boolean
+IgnoreExtension GL_EXT_separate_shader_objects
+IgnoreExtension GL_EXT_shadow_samplers
+IgnoreExtension GL_EXT_sRGB
+IgnoreExtension GL_EXT_texture_array
+IgnoreExtension GL_EXT_texture_rg
+IgnoreExtension GL_OES_compressed_ETC1_RGB8_texture
+IgnoreExtension GL_EXT_debug_marker
+IgnoreExtension GL_EXT_debug_label
+IgnoreExtension GL_EXT_multisampled_render_to_texture
+IgnoreExtension GL_EXT_framebuffer_multisample
 
+# IgnoreExtension GL_EXT_texture_storage
+IgnoreExtension GL_NV_draw_buffers
+IgnoreExtension GL_NV_fbo_color_attachments
 IgnoreExtension GL_OES_vertex_array_object
 IgnoreExtension GL_OES_texture_3D
+# above ext are subsumed, so ignore the aliased ones
+Ignore GL_ACTIVE_PROGRAM
+Ignore GL_ALPHA16F
+Ignore GL_ALPHA32F
+Ignore GL_ALPHA8
+Ignore GL_ANY_SAMPLES_PASSED
+Ignore GL_ANY_SAMPLES_PASSED_CONSERVATIVE
+Ignore GL_BGRA8
+Ignore GL_BGRA8_EXT
+Ignore GL_BUFFER_OBJECT_EXT
+Ignore GL_COLOR_ATTACHMENT1
+Ignore GL_COLOR_ATTACHMENT10
+Ignore GL_COLOR_ATTACHMENT11
+Ignore GL_COLOR_ATTACHMENT12
+Ignore GL_COLOR_ATTACHMENT13
+Ignore GL_COLOR_ATTACHMENT14
+Ignore GL_COLOR_ATTACHMENT15
+Ignore GL_COLOR_ATTACHMENT2
+Ignore GL_COLOR_ATTACHMENT3
+Ignore GL_COLOR_ATTACHMENT4
+Ignore GL_COLOR_ATTACHMENT5
+Ignore GL_COLOR_ATTACHMENT6
+Ignore GL_COLOR_ATTACHMENT7
+Ignore GL_COLOR_ATTACHMENT8
+Ignore GL_COLOR_ATTACHMENT9
+Ignore GL_COMPARE_REF_TO_TEXTURE
+Ignore GL_CONTEXT_ROBUST_ACCESS
+Ignore GL_CURRENT_QUERY
+Ignore GL_DRAW_BUFFER0
+Ignore GL_DRAW_BUFFER1
+Ignore GL_DRAW_BUFFER10
+Ignore GL_DRAW_BUFFER11
+Ignore GL_DRAW_BUFFER12
+Ignore GL_DRAW_BUFFER13
+Ignore GL_DRAW_BUFFER14
+Ignore GL_DRAW_BUFFER15
+Ignore GL_DRAW_BUFFER2
+Ignore GL_DRAW_BUFFER3
+Ignore GL_DRAW_BUFFER4
+Ignore GL_DRAW_BUFFER5
+Ignore GL_DRAW_BUFFER6
+Ignore GL_DRAW_BUFFER7
+Ignore GL_DRAW_BUFFER8
+Ignore GL_DRAW_BUFFER9
+Ignore GL_FRAGMENT_SHADER_BIT
+Ignore GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING
+Ignore GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE
+Ignore GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT
+Ignore GL_INT_10_10_10_2
+Ignore GL_LUMINANCE16F
+Ignore GL_LUMINANCE32F
+Ignore GL_LUMINANCE8
+Ignore GL_LUMINANCE8_ALPHA8
+Ignore GL_LUMINANCE_ALPHA16F
+Ignore GL_LUMINANCE_ALPHA32F
+Ignore GL_MAX_COLOR_ATTACHMENTS
+Ignore GL_MAX_DRAW_BUFFERS
+Ignore GL_PROGRAM_OBJECT_EXT
+Ignore GL_PROGRAM_PIPELINE_BINDING
+Ignore GL_PROGRAM_PIPELINE_OBJECT_EXT
+Ignore GL_PROGRAM_SEPARABLE
+Ignore GL_QUERY_OBJECT_EXT
+Ignore GL_QUERY_RESULT
+Ignore GL_QUERY_RESULT_AVAILABLE
+Ignore GL_R16F
+Ignore GL_R8
+Ignore GL_RED
+Ignore GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES
+Ignore GL_RG
+Ignore GL_RG16F
+Ignore GL_RG8
+Ignore GL_RGB16F
+Ignore GL_RGBA16F
+Ignore GL_SAMPLER_2D_SHADOW
+Ignore GL_SAMPLER_EXTERNAL_OES
+Ignore GL_SHADER_BINARY_DMP
+Ignore GL_SHADER_OBJECT_EXT
+Ignore GL_TEXTURE_BINDING_EXTERNAL_OES
+Ignore GL_TEXTURE_COMPARE_FUNC
+Ignore GL_TEXTURE_COMPARE_MODE
+Ignore GL_TEXTURE_EXTERNAL_OES
+Ignore GL_UNPACK_ROW_LENGTH
+Ignore GL_UNPACK_SKIP_PIXELS
+Ignore GL_UNPACK_SKIP_ROWS
+Ignore GL_UNSIGNED_INT_10_10_10_2
+Ignore GL_UNSIGNED_INT_2_10_10_10_REV
+Ignore GL_UNSIGNED_NORMALIZED
+Ignore GL_VERTEX_ARRAY_OBJECT_EXT
+Ignore GL_VERTEX_SHADER_BIT
+Ignore glFramebufferTexture2DMultisampleEXT
+Ignore glGetObjectLabelEXT
+Ignore glInsertEventMarkerEXT
+Ignore glLabelObjectEXT
+Ignore glPopGroupMarkerEXT
+Ignore glProgramUniform1f
+Ignore glProgramUniform1fv
+Ignore glProgramUniform1i
+Ignore glProgramUniform1iv
+Ignore glProgramUniform2f
+Ignore glProgramUniform2fv
+Ignore glProgramUniform2i
+Ignore glProgramUniform2iv
+Ignore glProgramUniform3f
+Ignore glProgramUniform3fv
+Ignore glProgramUniform3i
+Ignore glProgramUniform3iv
+Ignore glProgramUniform4f
+Ignore glProgramUniform4fv
+Ignore glProgramUniform4i
+Ignore glProgramUniform4iv
+Ignore glProgramUniformMatrix2fv
+Ignore glProgramUniformMatrix3fv
+Ignore glProgramUniformMatrix4fv
+Ignore glPushGroupMarkerEXT
 
 # isn't included in GL2
 Ignore GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET
diff --git a/make/config/jogl/gl-if-gl.cfg b/make/config/jogl/gl-if-gl.cfg
index 2f7932b67..89233330a 100644
--- a/make/config/jogl/gl-if-gl.cfg
+++ b/make/config/jogl/gl-if-gl.cfg
@@ -21,12 +21,15 @@ Ignore ^gl.*x
 Ignore ^gl.*xOES
 Ignore glEGL.*
 
+# dummy procaddress config / force procaddress for comments
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
+ForceProcAddressGen __ALL__
 
 # Inform the glue code generator of the association between #defines
-# and functions and the extensions in which they are defined
+# and functions and the extensions in which they are defined.
+# This also gives a better API doc since it includes all extension names.
 GLHeader GLES2/gl2.h
 GLHeader GLES2/gl2ext.h
 GLHeader GL/gl.h
diff --git a/make/config/jogl/gl-if-gl2.cfg b/make/config/jogl/gl-if-gl2.cfg
index d9bddae53..c58b73dfd 100644
--- a/make/config/jogl/gl-if-gl2.cfg
+++ b/make/config/jogl/gl-if-gl2.cfg
@@ -28,6 +28,12 @@ Include gl-if-gl4-ignores.cfg
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
+# dummy procaddress config / force procaddress for comments
+EmitProcAddressTable false
+ProcAddressTableClassName DontGenerateProcAddressTableStuff
+GetProcAddressTableExpr DontGenerateProcAddressTableStuff
+ForceProcAddressGen __ALL__
+
 # Ignore extensions that are already picked up via the GL2ES1 interface
 IgnoreExtension GL_EXT_point_parameters
 
@@ -36,7 +42,3 @@ CustomJavaCode GL2     public boolean glIsPBOUnpackEnabled();
 
 Include gl-headers.cfg
 
-EmitProcAddressTable false
-ProcAddressTableClassName DontGenerateProcAddressTableStuff
-GetProcAddressTableExpr DontGenerateProcAddressTableStuff
-
diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg
index db3389064..ad8bbea7d 100644
--- a/make/config/jogl/gl-if-gl2_es1.cfg
+++ b/make/config/jogl/gl-if-gl2_es1.cfg
@@ -35,6 +35,7 @@ DropUniqVendorExtensions VIV
 IgnoreExtension GL_EXT_discard_framebuffer
 IgnoreExtension GL_OES_compressed_paletted_texture
 IgnoreExtension GL_OES_vertex_array_object
+IgnoreExtension GL_OES_EGL_image_external
 
 IgnoreExtension GL_OES_compressed_ETC1_RGB8_texture
 IgnoreExtension GL_OES_draw_texture
@@ -44,6 +45,10 @@ IgnoreExtension GL_OES_point_size_array
 IgnoreExtension GL_OES_query_matrix
 IgnoreExtension GL_OES_vertex_half_float
 
+IgnoreExtension GL_EXT_debug_marker
+IgnoreExtension GL_EXT_debug_label
+IgnoreExtension GL_EXT_multisampled_render_to_texture
+
 # isn't included in GL2
 # includes GL_STATE_RESTORE, which hasn't the QCOM suffix
 IgnoreExtension GL_QCOM_extended_get
@@ -101,9 +106,11 @@ Ignore glGetFixedv
 CustomJavaCode GL2ES1 public void glOrtho(double left, double right, double bottom, double top, double near_val, double far_val);
 CustomJavaCode GL2ES1 public void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar);
 
+# dummy procaddress config / force procaddress for comments
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
+ForceProcAddressGen __ALL__
 
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg
index 95c89eb37..6a8aef06b 100644
--- a/make/config/jogl/gl-if-gl2_es2.cfg
+++ b/make/config/jogl/gl-if-gl2_es2.cfg
@@ -35,6 +35,10 @@ IgnoreExtension GL_EXT_discard_framebuffer
 IgnoreExtension GL_OES_compressed_paletted_texture
 IgnoreExtension GL_OES_compressed_ETC1_RGB8_texture
 IgnoreExtension GL_OES_vertex_array_object
+IgnoreExtension GL_OES_EGL_image_external
+IgnoreExtension GL_EXT_debug_marker
+IgnoreExtension GL_EXT_debug_label
+IgnoreExtension GL_EXT_multisampled_render_to_texture
 
 # isn't included in GL2
 # includes GL_STATE_RESTORE, which hasn't the QCOM suffix
@@ -61,12 +65,15 @@ CustomJavaCode GL2ES2 public void glDepthRange(double zNear, double zFar);
 
 IncludeAs CustomJavaCode GL2ES2 gl-if-CustomJavaCode-gl2_es2.java
 
+# dummy procaddress config / force procaddress for comments
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
+ForceProcAddressGen __ALL__
 
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
+# This also gives a better API doc since it includes all extension names.
 GLHeader GLES2/gl2.h
 GLHeader GLES2/gl2ext.h
 GLHeader GL/gl.h
diff --git a/make/config/jogl/gl-if-gl2_gl3.cfg b/make/config/jogl/gl-if-gl2_gl3.cfg
index 12de7afd3..0c51dfe9c 100644
--- a/make/config/jogl/gl-if-gl2_gl3.cfg
+++ b/make/config/jogl/gl-if-gl2_gl3.cfg
@@ -27,20 +27,17 @@ NativeOutputDir gensrc/native/jogl
 # Same name but different signature ..
 # No collisions found .. good!
 
+# dummy procaddress config / force procaddress for comments
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
+ForceProcAddressGen __ALL__
 
 # 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
 
-# Force all of the methods to be emitted using dynamic linking so we
-# don't need to link against any emulation library on the desktop or
-# depend on the presence of an import library for a particular device
-ForceProcAddressGen __ALL__
-
 # Also force the calling conventions of the locally generated function
 # pointer typedefs for these routines to APIENTRY
 LocalProcAddressCallingConvention __ALL__ APIENTRY
diff --git a/make/config/jogl/gl-if-gl3-ignores.cfg b/make/config/jogl/gl-if-gl3-ignores.cfg
index 672c62278..a84f7fb05 100644
--- a/make/config/jogl/gl-if-gl3-ignores.cfg
+++ b/make/config/jogl/gl-if-gl3-ignores.cfg
@@ -7,7 +7,7 @@
 # OpenGL 3.x dependencies
 #
 # We allow GL_VERSION_3_0 within GL2
-IgnoreExtension GL_VERSION_3_1
+# IgnoreExtension GL_VERSION_3_1 - contains common tokens
 IgnoreExtension GL_VERSION_3_2
 IgnoreExtension GL_VERSION_3_3
 IgnoreExtension GL_VERSION_3_4
diff --git a/make/config/jogl/gl-if-gl3-subset.cfg b/make/config/jogl/gl-if-gl3-subset.cfg
index 85797894d..dae38ec0c 100644
--- a/make/config/jogl/gl-if-gl3-subset.cfg
+++ b/make/config/jogl/gl-if-gl3-subset.cfg
@@ -10,6 +10,8 @@ Include gl3-desktop.cfg
 Include gl-if-gl3-ignores.cfg
 Include gl-if-gl4-ignores.cfg
 
+# dummy procaddress config / force procaddress for comments
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
+ForceProcAddressGen __ALL__
diff --git a/make/config/jogl/gl-if-gl3.cfg b/make/config/jogl/gl-if-gl3.cfg
index 88cf57d04..649b35165 100644
--- a/make/config/jogl/gl-if-gl3.cfg
+++ b/make/config/jogl/gl-if-gl3.cfg
@@ -25,14 +25,13 @@ Include gl-common-extensions.cfg
 Include gl3-desktop.cfg
 Include gl-if-gl4-ignores.cfg
 
-EmitProcAddressTable false
-
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
 Include gl3-headers.cfg
 
+# dummy procaddress config / force procaddress for comments
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
-
+ForceProcAddressGen __ALL__
diff --git a/make/config/jogl/gl-if-gl3bc.cfg b/make/config/jogl/gl-if-gl3bc.cfg
index 3381051c6..f07a9a417 100644
--- a/make/config/jogl/gl-if-gl3bc.cfg
+++ b/make/config/jogl/gl-if-gl3bc.cfg
@@ -39,7 +39,8 @@ IgnoreExtension GL_EXT_point_parameters
 Include gl-headers.cfg
 Include gl3ext-headers.cfg
 
+# dummy procaddress config / force procaddress for comments
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
-
+ForceProcAddressGen __ALL__
diff --git a/make/config/jogl/gl-if-gl4.cfg b/make/config/jogl/gl-if-gl4.cfg
index 5b4d45200..1e920ac7c 100644
--- a/make/config/jogl/gl-if-gl4.cfg
+++ b/make/config/jogl/gl-if-gl4.cfg
@@ -20,10 +20,11 @@ Include gl-common.cfg
 Include gl-common-extensions.cfg
 Include gl3-desktop.cfg
 
+# dummy procaddress config / force procaddress for comments
 EmitProcAddressTable false
 ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
-
+ForceProcAddressGen __ALL__
 
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true