Update GlueGen to 7dc9c5601d5689dcbc003ca51cfe826942ea3e6b (latest)

- Fixes for OpenGL 3.2
- More strict define/function checking
- Better documentation in source code: extension relation
- GL extension marker exclusion is done by GlueGen now
- Adapted gluegen cfg files

Added OpenGL 3.2 extensions for GL3

Revalidation of all OpenGL 2.0/3.0/3.1 and 3.2 extensions

GL2GL3 based on OpenGL 2.0/3.0 headers

EGL shares common egl-common.cfg file

Removed experimental java system property 'jogl.GLContext.3_2',
try a 3.2 context in case of GL3.

X11GLXContext:
    - Always try to make a created context current,
      to verify it's usability. This is different than under WGL.

    - Temporary removed usage: GLX.GLX_CONTEXT_PROFILE_MASK_ARB
      NV driver bug.

1 files changed, 16 insertions, 4 deletions

diff --git a/make/config/jogl/gl-if-gl2_gl3.cfg b/make/config/jogl/gl-if-gl2_gl3.cfg
index 0afe5d5b5..7f6903dd6 100644
--- a/make/config/jogl/gl-if-gl2_gl3.cfg
+++ b/make/config/jogl/gl-if-gl2_gl3.cfg
@@ -10,18 +10,18 @@ ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/G
 ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
 ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java
 
-ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/javax/media/opengl/GL2Set.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/javax/media/opengl/GL3Set.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
 Include gl-common-extensions.cfg
+Include gl-desktop.cfg
 
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl
 
 #
 # Same name but different signature ..
-#
 # No collisions found .. good!
 
 EmitProcAddressTable false
@@ -30,10 +30,22 @@ GetProcAddressTableExpr DontGenerateProcAddressTableStuff
 
 # Inform the glue code generator of the association between #defines
 # and functions and the extensions in which they are defined
-GLHeader GL3/gl3.h
-GLHeader GL3/gl3ext.h
+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
 
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
+# Ignore extensions that are already picked up via the GL2ES1 interface
+IgnoreExtension GL_EXT_point_parameters
+
 Import java.io.PrintStream