Merge remote-tracking branch 'upstream/master'

5 files changed, 300 insertions, 102 deletions

diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
index 5334d45cf..262fed934 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
@@ -57,10 +57,31 @@ import java.util.Set;
 
 public class BuildComposablePipeline {
 
-    public static final int GEN_DEBUG = 1 << 0; // default
-    public static final int GEN_TRACE = 1 << 1; // default
+    /** <p>Default: true</p>. */
+    public static final int GEN_DEBUG = 1 << 0;
+    /** <p>Default: true</p>. */
+    public static final int GEN_TRACE = 1 << 1;
+    /** <p>Default: false</p>. */
     public static final int GEN_CUSTOM = 1 << 2;
+    /**
+     * By extra command-line argument: <code>prolog_xor_downstream</code>.
+     * <p>
+     * If true, either prolog (if exist) is called or downstream's method, but not both.
+     * By default, both methods would be called. 
+     * </p>
+     * <p>Default: false</p>
+     */
     public static final int GEN_PROLOG_XOR_DOWNSTREAM = 1 << 3;
+    /**
+     * By extra command-line argument: <code>gl_identity_by_assignable_class</code>.
+     * <p>
+     * If true, implementation does not utilize downstream's <code>isGL*()</code>
+     * implementation, but determines whether the GL profile is matched by interface inheritance.
+     * </p>
+     * <p>Default: false</p>
+     */
+    public static final int GEN_GL_IDENTITY_BY_ASSIGNABLE_CLASS = 1 << 4;
+    
     int mode;
     private String outputDir;
     private String outputPackage;
@@ -71,7 +92,7 @@ public class BuildComposablePipeline {
     // Only desktop OpenGL has immediate mode glBegin / glEnd
     private boolean hasImmediateMode;
     // Desktop OpenGL and GLES1 have GL_STACK_OVERFLOW and GL_STACK_UNDERFLOW errors
-    private boolean hasStackOverflow;
+    private boolean hasGL2ES1StackOverflow;
 
     public static Class<?> getClass(String name) {
         Class<?> clazz = null;
@@ -110,8 +131,12 @@ public class BuildComposablePipeline {
             classDownstream = getClass(args[4]);
             mode = GEN_CUSTOM;
             if (args.length > 5) {
-                if (args[5].equals("prolog_xor_downstream")) {
-                    mode |= GEN_PROLOG_XOR_DOWNSTREAM;
+                for(int i=5; i<args.length; i++) {
+                    if (args[i].equals("prolog_xor_downstream")) {
+                        mode |= GEN_PROLOG_XOR_DOWNSTREAM;
+                    } else if (args[i].equals("gl_identity_by_assignable_class")) {
+                        mode |= GEN_GL_IDENTITY_BY_ASSIGNABLE_CLASS;
+                    }
                 }
             }
         } else {
@@ -119,7 +144,7 @@ public class BuildComposablePipeline {
             outputName = null; // TBD ..
             classPrologOpt = null;
             classDownstream = classToComposeAround;
-            mode = GEN_DEBUG | GEN_TRACE;
+            mode = GEN_DEBUG | GEN_TRACE ;
         }
 
         BuildComposablePipeline composer =
@@ -155,7 +180,7 @@ public class BuildComposablePipeline {
         }
 
         try {
-            hasStackOverflow =
+            hasGL2ES1StackOverflow = hasImmediateMode &&
                     (classToComposeAround.getField("GL_STACK_OVERFLOW") != null);
         } catch (Exception e) {
         }
@@ -167,16 +192,16 @@ public class BuildComposablePipeline {
      */
     public void emit() throws IOException {
 
-        List<Method> publicMethodsRaw = Arrays.asList(classToComposeAround.getMethods());
+        final List<Method> publicMethodsRaw = Arrays.asList(classToComposeAround.getMethods());
 
-        Set<PlainMethod> publicMethodsPlain = new HashSet<PlainMethod>();
+        final Set<PlainMethod> publicMethodsPlain = new HashSet<PlainMethod>();
         for (Iterator<Method> iter = publicMethodsRaw.iterator(); iter.hasNext();) {
-            Method method = iter.next();
+            final Method method = iter.next();
             // Don't hook methods which aren't real GL methods,
             // such as the synthetic "isGL2ES2" "getGL2ES2"
-            String name = method.getName();
+            final String name = method.getName();
             boolean runHooks = name.startsWith("gl");
-            if (!name.startsWith("getGL") && !name.startsWith("isGL") && !name.equals("toString")) {
+            if ( !name.startsWith("getGL") && !name.startsWith("isGL") && !name.equals("getDownstreamGL") && !name.equals("toString") ) {
                 publicMethodsPlain.add(new PlainMethod(method, runHooks));
             }
         }
@@ -602,12 +627,17 @@ public class BuildComposablePipeline {
          * Emits one of the isGL* methods.
          */
         protected void emitGLIsMethod(PrintWriter output, String type) {
-            output.println("  public boolean is" + type + "() {");
-            Class<?> clazz = BuildComposablePipeline.getClass("javax.media.opengl." + type);
-            if (clazz.isAssignableFrom(baseInterfaceClass)) {
-                output.println("    return true;");
+            output.println("  @Override");
+            output.println("  public final boolean is" + type + "() {");
+            if( 0 != (GEN_GL_IDENTITY_BY_ASSIGNABLE_CLASS & getMode() ) ) {
+                final Class<?> clazz = BuildComposablePipeline.getClass("javax.media.opengl." + type);
+                if (clazz.isAssignableFrom(baseInterfaceClass)) {
+                    output.println("    return true;");
+                } else {
+                    output.println("    return false;");
+                }
             } else {
-                output.println("    return false;");
+                output.println("    return " + getDownstreamObjectName() + ".is" + type + "();");
             }
             output.println("  }");
         }
@@ -624,27 +654,57 @@ public class BuildComposablePipeline {
             emitGLIsMethod(output, "GL2");
             emitGLIsMethod(output, "GLES1");
             emitGLIsMethod(output, "GLES2");
+            emitGLIsMethod(output, "GLES3");
             emitGLIsMethod(output, "GL2ES1");
             emitGLIsMethod(output, "GL2ES2");
+            emitGLIsMethod(output, "GL3ES3");
+            emitGLIsMethod(output, "GL4ES3");
             emitGLIsMethod(output, "GL2GL3");
-            output.println("  public boolean isGLES() {");
-            output.println("    return isGLES2() || isGLES1();");
+            if( 0 != (GEN_GL_IDENTITY_BY_ASSIGNABLE_CLASS & getMode() ) ) {
+                output.println("  @Override");
+                output.println("  public final boolean isGLES() {");
+                output.println("    return isGLES2() || isGLES1();");
+                output.println("  }");
+            } else {
+                emitGLIsMethod(output, "GLES");
+            }
+            output.println("  @Override");
+            output.println("  public final boolean isGL4core() {");
+            output.println("    return " + getDownstreamObjectName() + ".isGL4core();");
+            output.println("  }");
+            output.println("  @Override");
+            output.println("  public final boolean isGL3core() {");
+            output.println("    return " + getDownstreamObjectName() + ".isGL3core();");
             output.println("  }");
-            output.println("  public boolean isGLES2Compatible() {");
+            output.println("  @Override");
+            output.println("  public final boolean isGLcore() {");
+            output.println("    return " + getDownstreamObjectName() + ".isGLcore();");
+            output.println("  }");
+            output.println("  @Override");
+            output.println("  public final boolean isGLES2Compatible() {");
             output.println("    return " + getDownstreamObjectName() + ".isGLES2Compatible();");
             output.println("  }");
+            output.println("  @Override");
+            output.println("  public final boolean isGLES3Compatible() {");
+            output.println("    return " + getDownstreamObjectName() + ".isGLES3Compatible();");
+            output.println("  }");
         }
 
         /**
          * Emits one of the getGL* methods.
          */
         protected void emitGLGetMethod(PrintWriter output, String type) {
-            output.println("  public javax.media.opengl." + type + " get" + type + "() {");
-            Class<?> clazz = BuildComposablePipeline.getClass("javax.media.opengl." + type);
-            if (clazz.isAssignableFrom(baseInterfaceClass)) {
-                output.println("    return this;");
+            output.println("  @Override");
+            output.println("  public final javax.media.opengl." + type + " get" + type + "() {");
+            if( 0 != (GEN_GL_IDENTITY_BY_ASSIGNABLE_CLASS & getMode() ) ) {
+                final Class<?> clazz = BuildComposablePipeline.getClass("javax.media.opengl." + type);
+                if (clazz.isAssignableFrom(baseInterfaceClass)) {
+                    output.println("    return this;");
+                } else {
+                    output.println("    throw new GLException(\"Not a " + type + " implementation\");");
+                }
             } else {
-                output.println("    throw new GLException(\"Not a " + type + " implementation\");");
+                output.println("    return " + getDownstreamObjectName() + ".get" + type + "();");
             }
             output.println("  }");
         }
@@ -661,10 +721,18 @@ public class BuildComposablePipeline {
             emitGLGetMethod(output, "GL2");
             emitGLGetMethod(output, "GLES1");
             emitGLGetMethod(output, "GLES2");
+            emitGLGetMethod(output, "GLES3");
             emitGLGetMethod(output, "GL2ES1");
             emitGLGetMethod(output, "GL2ES2");
+            emitGLGetMethod(output, "GL3ES3");
+            emitGLGetMethod(output, "GL4ES3");
             emitGLGetMethod(output, "GL2GL3");
-            output.println("  public GLProfile getGLProfile() {");
+            output.println("  @Override");
+            output.println("  public final GL getDownstreamGL() throws GLException {");
+            output.println("    return " + getDownstreamObjectName() + ";");
+            output.println("  }");
+            output.println("  @Override");
+            output.println("  public final GLProfile getGLProfile() {");
             output.println("    return " + getDownstreamObjectName() + ".getGLProfile();");
             output.println("  }");
         }
@@ -870,9 +938,9 @@ public class BuildComposablePipeline {
             output.println("        case GL_INVALID_ENUM: buf.append(\"GL_INVALID_ENUM \"); break;");
             output.println("        case GL_INVALID_VALUE: buf.append(\"GL_INVALID_VALUE \"); break;");
             output.println("        case GL_INVALID_OPERATION: buf.append(\"GL_INVALID_OPERATION \"); break;");
-            if (hasStackOverflow) {
-                output.println("        case GL_STACK_OVERFLOW: buf.append(\"GL_STACK_OVERFLOW \"); break;");
-                output.println("        case GL_STACK_UNDERFLOW: buf.append(\"GL_STACK_UNDERFLOW \"); break;");
+            if (hasGL2ES1StackOverflow) {
+                output.println("        case GL2ES1.GL_STACK_OVERFLOW: buf.append(\"GL_STACK_OVERFLOW \"); break;");
+                output.println("        case GL2ES1.GL_STACK_UNDERFLOW: buf.append(\"GL_STACK_UNDERFLOW \"); break;");
             }
             output.println("        case GL_OUT_OF_MEMORY: buf.append(\"GL_OUT_OF_MEMORY \"); break;");
             output.println("        case GL_NO_ERROR: throw new InternalError(\"Should not be treating GL_NO_ERROR as error\");");
@@ -902,15 +970,20 @@ public class BuildComposablePipeline {
         }
 
         protected void emitClassDocComment(PrintWriter output) {
-            output.println("/** <P> Composable pipeline which wraps an underlying {@link GL} implementation,");
-            output.println("    providing error checking after each OpenGL method call. If an error occurs,");
-            output.println("    causes a {@link GLException} to be thrown at exactly the point of failure.");
-            output.println("    Sample code which installs this pipeline: </P>");
-            output.println();
-            output.println("<PRE>");
-            output.println("     GL gl = drawable.setGL(new DebugGL(drawable.getGL()));");
-            output.println("</PRE>");
-            output.println("*/");
+            output.println("/**");
+            output.println(" * <p>");
+            output.println(" * Composable pipeline which wraps an underlying {@link GL} implementation,");
+            output.println(" * providing error checking after each OpenGL method call. If an error occurs,");
+            output.println(" * causes a {@link GLException} to be thrown at exactly the point of failure.");
+            output.println(" * </p>");
+            output.println(" * <p>");
+            output.println(" * Sample code which installs this pipeline:");
+            output.println(" * <pre>");
+            output.println(" *   gl = drawable.setGL(new DebugGL(drawable.getGL()));");
+            output.println(" * </pre>");
+            output.println(" * For automatic instantiation see {@link GLPipelineFactory#create(String, Class, GL, Object[])}");
+            output.println(" * </p>");
+            output.println(" */");
         }
 
         protected boolean hasPreDownstreamCallHook(Method m) {
@@ -1038,14 +1111,20 @@ public class BuildComposablePipeline {
         }
 
         protected void emitClassDocComment(PrintWriter output) {
-            output.println("/** <P> Composable pipeline which wraps an underlying {@link GL} implementation,");
-            output.println("    providing tracing information to a user-specified {@link java.io.PrintStream}");
-            output.println("    before and after each OpenGL method call. Sample code which installs this pipeline: </P>");
-            output.println();
-            output.println("<PRE>");
-            output.println("     GL gl = drawable.setGL(new TraceGL(drawable.getGL(), System.err));");
-            output.println("</PRE>");
-            output.println("*/");
+            output.println("/**");
+            output.println(" * <p>");
+            output.println(" * Composable pipeline which wraps an underlying {@link GL} implementation,");
+            output.println(" * providing tracing information to a user-specified {@link java.io.PrintStream}");
+            output.println(" * before and after each OpenGL method call.");
+            output.println(" * </p>");
+            output.println(" * <p>");
+            output.println(" * Sample code which installs this pipeline:");
+            output.println(" * <pre>");
+            output.println(" *   gl = drawable.setGL(new TraceGL(drawable.getGL(), System.err));");
+            output.println(" * </pre>");
+            output.println(" * For automatic instantiation see {@link GLPipelineFactory#create(String, Class, GL, Object[])}");
+            output.println(" * </p>");
+            output.println(" */");
         }
 
         protected boolean hasPreDownstreamCallHook(Method m) {
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java
index 482d35cae..5298cc357 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildStaticGLInfo.java
@@ -106,14 +106,21 @@ import java.util.regex.Pattern;
 public class BuildStaticGLInfo {
 
   // Handles function pointer 
-  protected static int funcIdentifierGroup = 10;
+  protected static final int funcIdentifierGroup = 9;
   protected static Pattern funcPattern =
-    Pattern.compile("^(GLAPI|GL_API|GL_APICALL|EGLAPI|extern)?(\\s*)((unsigned|const)\\s+)?(\\w+)(\\s*\\*)?(\\s+)(GLAPIENTRY|GL_APIENTRY|APIENTRY|EGLAPIENTRY|WINAPI)?(\\s*)([ew]?gl\\w+)\\s?(\\(.*)");
+    Pattern.compile("^(GLAPI|GL_API|GL_APICALL|EGLAPI|extern)?(\\s*)((unsigned|const)\\s+)?(\\w+)(\\s+\\*\\s*|\\s*\\*\\s+|\\s+)?(GLAPIENTRY|GL_APIENTRY|APIENTRY|EGLAPIENTRY|WINAPI)?(\\s*)([ew]?gl\\w+)\\s?(\\(.*)");
 
   protected static Pattern associationPattern =
     Pattern.compile("\\#ifndef ([CEW]?GL[XU]?_[A-Za-z0-9_]+)(.*)");
 
-  protected static int defineIdentifierGroup = 1;
+  protected static Pattern ifPattern =
+    Pattern.compile("\\#if(.*)");
+  protected static Pattern elsePattern =
+    Pattern.compile("\\#(elif|else)(.*)");
+  protected static Pattern endifPattern =
+    Pattern.compile("\\#endif(.*)");
+  
+  protected static final int defineIdentifierGroup = 1;
   protected static Pattern definePattern =
     Pattern.compile("\\#define ([CEW]?GL[XU]?_[A-Za-z0-9_]+)\\s*([A-Za-z0-9_]+)(.*)");
 
@@ -194,38 +201,62 @@ public class BuildStaticGLInfo {
         BufferedReader reader = new BufferedReader(new FileReader(cHeaderFilePath));
         String line, activeAssociation = null;
         Matcher m = null;
+        int block = 0;
         while ((line = reader.readLine()) != null) {
-            int type = 0; // 1-define, 2-function
-            // see if we're inside a #ifndef GL_XXX block and matching a function
-            if (activeAssociation != null) {
+            int type = 0; // 1-define, 2-function            
+            if ( 0 < block ) { // inside a #ifndef GL_XXX block and matching a function, if block > 0
                 String identifier = null;
-                if ((m = funcPattern.matcher(line)).matches()) {
-                    identifier = m.group(funcIdentifierGroup).trim();
-                    type = 2;
-                } else if ((m = definePattern.matcher(line)).matches()) {
-                    identifier = m.group(defineIdentifierGroup).trim();
-                    type = 1;
-                } else if (line.startsWith("#endif")) {
-                    if (DEBUG) {
-                        System.err.println("END ASSOCIATION BLOCK: <" + activeAssociation + ">");
+                if( 2 >= block ) {  // not within sub-blocks > 2, i.e. further typedefs
+                    if ((m = funcPattern.matcher(line)).matches()) {
+                        identifier = m.group(funcIdentifierGroup).trim();
+                        type = 2;
+                    } else if ((m = definePattern.matcher(line)).matches()) {
+                        identifier = m.group(defineIdentifierGroup).trim();
+                        type = 1;
                     }
-                    activeAssociation = null;
                 }
-                if ((identifier != null)
-                        && (activeAssociation != null)
-                        && // Handles #ifndef GL_... #define GL_...
-                        !identifier.equals(activeAssociation)) {
+                if ( identifier != null &&
+                     activeAssociation != null &&                     
+                     !identifier.equals(activeAssociation) // Handles #ifndef GL_... #define GL_... 
+                   ) 
+                {
                     addAssociation(identifier, activeAssociation);
                     if (DEBUG) {
-                        System.err.println("  ADDING ASSOCIATION: <" + identifier + "> <" + activeAssociation + "> ; type " + type);
+                        System.err.println("<"+block+">   ADDING ASSOCIATION: <" + identifier + "> <" + activeAssociation + "> ; type " + type);
+                    }
+                } else {
+                    if ((m = ifPattern.matcher(line)).matches()) {
+                        final String comment = m.group(1).trim();
+                        block++;
+                        if (DEBUG) {
+                            System.err.println("<"+block+"> BEGIN IF BLOCK: <" + comment + ">");
+                        }
+                    } else if ((m = elsePattern.matcher(line)).matches()) {
+                        final String comment = m.group(1).trim();
+                        if (DEBUG) {
+                            System.err.println("<"+block+"> ELSE BLOCK: <" + comment + ">");
+                        }
+                    } else if ((m = endifPattern.matcher(line)).matches()) {
+                        final String comment = m.group(1).trim();
+                        block--;
+                        if( 0 == block ) {
+                            if (DEBUG) {
+                                System.err.println("<"+block+"> END ASSOCIATION BLOCK: <" + activeAssociation + " <-> " + comment + ">");
+                            }
+                            activeAssociation = null;                
+                        } else {
+                            if (DEBUG) {
+                                System.err.println("<"+block+"> END IF BLOCK: <" + comment + ">");
+                            }
+                        }
                     }
                 }
-            } else if ((m = associationPattern.matcher(line)).matches()) {
+            } else if ((m = associationPattern.matcher(line)).matches()) {                
                 // found a new #ifndef GL_XXX block
                 activeAssociation = m.group(1).trim();
-
+                block++;
                 if (DEBUG) {
-                    System.err.println("BEGIN ASSOCIATION BLOCK: <" + activeAssociation + ">");
+                    System.err.println("<"+block+"> BEGIN ASSOCIATION BLOCK: <" + activeAssociation + ">");
                 }
             }
         }
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java
index ba025e18c..d4dca715b 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java
@@ -61,6 +61,7 @@ public class GLConfiguration extends ProcAddressConfiguration {
     // The following data members support ignoring an entire extension at a time
     private List<String> glHeaders = new ArrayList<String>();
     private Set<String> ignoredExtensions = new HashSet<String>();
+    private Set<String> forcedExtensions = new HashSet<String>();
     private Set<String> extensionsRenamedIntoCore = new HashSet<String>();
     private BuildStaticGLInfo glInfo;
 
@@ -90,6 +91,9 @@ public class GLConfiguration extends ProcAddressConfiguration {
         if (cmd.equalsIgnoreCase("IgnoreExtension")) {
             String sym = readString("IgnoreExtension", tok, filename, lineNo);
             ignoredExtensions.add(sym);
+        } else if (cmd.equalsIgnoreCase("ForceExtension")) {
+            String sym = readString("ForceExtension", tok, filename, lineNo);
+            forcedExtensions.add(sym);
         } else if (cmd.equalsIgnoreCase("RenameExtensionIntoCore")) {
             String sym = readString("RenameExtensionIntoCore", tok, filename, lineNo);
             extensionsRenamedIntoCore.add(sym);
@@ -202,16 +206,21 @@ public class GLConfiguration extends ProcAddressConfiguration {
         for (String str : ignoredExtensions) {
             System.err.println("\t" + str);
         }
+        System.err.println("GL Forced extensions: ");
+        for (String str : forcedExtensions) {
+            System.err.println("\t" + str);
+        }
         super.dumpIgnores();
     }
 
     protected boolean shouldIgnoreExtension(String symbol, boolean criteria) {
         if (criteria && glInfo != null) {
-            Set<String> extensionNames = glInfo.getExtension(symbol);
-            if(null!=extensionNames) {
-                for(Iterator<String> i=extensionNames.iterator(); i.hasNext(); ) {
-                    String extensionName = i.next();
-                    if (extensionName != null && ignoredExtensions.contains(extensionName)) {
+            final Set<String> extensionNames = glInfo.getExtension(symbol);
+            if( null != extensionNames ) {
+                boolean ignoredExtension = false;
+                for(Iterator<String> i=extensionNames.iterator(); !ignoredExtension && i.hasNext(); ) {
+                    final String extensionName = i.next();
+                    if ( extensionName != null && ignoredExtensions.contains(extensionName) ) {
                         if (DEBUG_IGNORES) {
                             System.err.print("Ignore symbol <" + symbol + "> of extension <" + extensionName + ">");
                             if(extensionNames.size()==1) {
@@ -220,9 +229,26 @@ public class GLConfiguration extends ProcAddressConfiguration {
                                 System.err.println(", WARNING MULTIPLE OCCURENCE: "+extensionNames);
                             }
                         }
-                        return true;
+                        ignoredExtension = true;
+                    }
+                }
+                if( ignoredExtension ) {
+                    ignoredExtension = !shouldForceExtension( symbol, true, symbol );                        
+                    if( ignoredExtension ) {
+                        final Set<String> origSymbols = getRenamedJavaSymbols( symbol );
+                        if(null != origSymbols) {
+                            for(String origSymbol : origSymbols) {
+                                if( shouldForceExtension( origSymbol, true, symbol ) ) {
+                                    ignoredExtension = false;
+                                    break;
+                                }
+                            }
+                        }                    
                     }
                 }
+                if( ignoredExtension ) {
+                    return true;
+                }
             }
             boolean isGLEnum = GLNameResolver.isGLEnumeration(symbol);
             boolean isGLFunc = GLNameResolver.isGLFunction(symbol);
@@ -240,6 +266,29 @@ public class GLConfiguration extends ProcAddressConfiguration {
         }
         return false;
     }
+    
+    public boolean shouldForceExtension(final String symbol, final boolean criteria, final String renamedSymbol) {
+        if (criteria && glInfo != null) {
+            final Set<String> extensionNames = glInfo.getExtension(symbol);
+            if( null != extensionNames ) {
+                for(Iterator<String> i=extensionNames.iterator(); i.hasNext(); ) {
+                    final String extensionName = i.next();
+                    if ( extensionName != null && forcedExtensions.contains(extensionName) ) {
+                        if (DEBUG_IGNORES) {
+                            System.err.print("Not Ignore symbol <" + symbol + " -> " + renamedSymbol + "> of extension <" + extensionName + ">");
+                            if(extensionNames.size()==1) {
+                                System.err.println(", single .");
+                            } else {
+                                System.err.println(", WARNING MULTIPLE OCCURENCE: "+extensionNames);
+                            }
+                        }
+                        return true;
+                    }
+                }            
+            }
+        }
+        return false;
+    }
 
     @Override
     public boolean shouldIgnoreInInterface(String symbol) {
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
index 809c6783d..075c8bfd8 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
@@ -454,34 +454,69 @@ public class GLEmitter extends ProcAddressEmitter {
         return (GLConfiguration) getConfig();
     }
 
+    /**
+     * {@inheritDoc}
+     */   
     @Override
     protected void endProcAddressTable() throws Exception {
         PrintWriter w = tableWriter;
-
-        w.println("  /**");
-        w.println("   * This is a convenience method to get (by name) the native function");
-        w.println("   * pointer for a given function. It lets you avoid having to");
-        w.println("   * manually compute the &quot;" + PROCADDRESS_VAR_PREFIX + " + ");
-        w.println("   * &lt;functionName&gt;&quot; member variable name and look it up via");
-        w.println("   * reflection; it also will throw an exception if you try to get the");
-        w.println("   * address of an unknown function, or one that is statically linked");
-        w.println("   * and therefore does not have a function pointer in this table.");
-        w.println("   *");
-        w.println("   * @throws RuntimeException if the function pointer was not found in");
-        w.println("   *   this table, either because the function was unknown or because");
-        w.println("   *   it was statically linked.");
-        w.println("   */");
-        w.println("  public long getAddressFor(String functionNameUsr) {");
-        w.println("    String functionNameBase = "+GLNameResolver.class.getName()+".normalizeVEN(com.jogamp.gluegen.runtime.opengl.GLNameResolver.normalizeARB(functionNameUsr, true), true);");
-        w.println("    String addressFieldNameBase = PROCADDRESS_VAR_PREFIX + functionNameBase;");
-        w.println("    java.lang.reflect.Field addressField = null;");
-        w.println("    int  funcNamePermNum = "+GLNameResolver.class.getName()+".getFuncNamePermutationNumber(functionNameBase);");
-        w.println("    for(int i = 0; null==addressField && i < funcNamePermNum; i++) {");
-        w.println("        String addressFieldName = "+GLNameResolver.class.getName()+".getFuncNamePermutation(addressFieldNameBase, i);");
-        w.println("        try {");
-        w.println("          addressField = getClass().getField(addressFieldName);");
-        w.println("        } catch (Exception e) { }");
+        
+        w.println("  @Override");
+        w.println("  protected boolean isFunctionAvailableImpl(String functionNameUsr) throws IllegalArgumentException  {");
+        w.println("    final String functionNameBase = "+GLNameResolver.class.getName()+".normalizeVEN(com.jogamp.gluegen.runtime.opengl.GLNameResolver.normalizeARB(functionNameUsr, true), true);");
+        w.println("    final String addressFieldNameBase = \"" + PROCADDRESS_VAR_PREFIX + "\" + functionNameBase;");
+        w.println("    final int funcNamePermNum = "+GLNameResolver.class.getName()+".getFuncNamePermutationNumber(functionNameBase);");        
+        w.println("    final java.lang.reflect.Field addressField = java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<java.lang.reflect.Field>() {");
+        w.println("        public final java.lang.reflect.Field run() {");
+        w.println("            java.lang.reflect.Field addressField = null;");
+        w.println("            for(int i = 0; i < funcNamePermNum; i++) {");
+        w.println("                final String addressFieldName = "+GLNameResolver.class.getName()+".getFuncNamePermutation(addressFieldNameBase, i);");
+        w.println("                try {");
+        w.println("                    addressField = "+tableClassName+".class.getDeclaredField( addressFieldName );");
+        w.println("                    addressField.setAccessible(true); // we need to read the protected value!");
+        w.println("                    return addressField;");
+        w.println("                } catch (NoSuchFieldException ex) { }");
+        w.println("            }");
+        w.println("            return null;");
+        w.println("        } } );");
+        w.println();
+        w.println("    if(null==addressField) {");
+        w.println("      // The user is calling a bogus function or one which is not");
+        w.println("      // runtime linked");
+        w.println("      throw new RuntimeException(");
+        w.println("          \"WARNING: Address field query failed for \\\"\" + functionNameBase + \"\\\"/\\\"\" + functionNameUsr +");
+        w.println("          \"\\\"; it's either statically linked or address field is not a known \" +");
+        w.println("          \"function\");");
+        w.println("    } ");
+        w.println("    try {");
+        w.println("      return 0 != addressField.getLong(this);");
+        w.println("    } catch (Exception e) {");
+        w.println("      throw new RuntimeException(");
+        w.println("          \"WARNING: Address query failed for \\\"\" + functionNameBase + \"\\\"/\\\"\" + functionNameUsr +");
+        w.println("          \"\\\"; it's either statically linked or is not a known \" +");
+        w.println("          \"function\", e);");
         w.println("    }");
+        w.println("  }");
+        
+        w.println("  @Override");
+        w.println("  public long getAddressFor(String functionNameUsr) throws SecurityException, IllegalArgumentException {");
+        w.println("    SecurityUtil.checkAllLinkPermission();");
+        w.println("    final String functionNameBase = "+GLNameResolver.class.getName()+".normalizeVEN(com.jogamp.gluegen.runtime.opengl.GLNameResolver.normalizeARB(functionNameUsr, true), true);");
+        w.println("    final String addressFieldNameBase = \"" + PROCADDRESS_VAR_PREFIX + "\" + functionNameBase;");
+        w.println("    final int  funcNamePermNum = "+GLNameResolver.class.getName()+".getFuncNamePermutationNumber(functionNameBase);");
+        w.println("    final java.lang.reflect.Field addressField = java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<java.lang.reflect.Field>() {");
+        w.println("        public final java.lang.reflect.Field run() {");
+        w.println("            java.lang.reflect.Field addressField = null;");
+        w.println("            for(int i = 0; i < funcNamePermNum; i++) {");
+        w.println("                final String addressFieldName = "+GLNameResolver.class.getName()+".getFuncNamePermutation(addressFieldNameBase, i);");
+        w.println("                try {");
+        w.println("                    addressField = "+tableClassName+".class.getDeclaredField( addressFieldName );");
+        w.println("                    addressField.setAccessible(true); // we need to read the protected value!");
+        w.println("                    return addressField;");
+        w.println("                } catch (NoSuchFieldException ex) { }");
+        w.println("            }");
+        w.println("            return null;");
+        w.println("        } } );");
         w.println();
         w.println("    if(null==addressField) {");
         w.println("      // The user is calling a bogus function or one which is not");
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java
index 016674338..fdfaee8a6 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLJavaMethodBindingEmitter.java
@@ -43,6 +43,7 @@ import com.jogamp.gluegen.CommentEmitter;
 import com.jogamp.gluegen.JavaEmitter;
 import com.jogamp.gluegen.JavaMethodBindingEmitter;
 import com.jogamp.gluegen.MethodBinding;
+import com.jogamp.gluegen.cgram.types.FunctionSymbol;
 import com.jogamp.gluegen.cgram.types.Type;
 import com.jogamp.gluegen.procaddress.ProcAddressJavaMethodBindingEmitter;
 
@@ -103,11 +104,14 @@ public class GLJavaMethodBindingEmitter extends ProcAddressJavaMethodBindingEmit
         @Override
         protected void emitBindingCSignature(MethodBinding binding, PrintWriter writer) {
 
-            super.emitBindingCSignature(binding, writer);
-
             String symbolRenamed = binding.getName();
             StringBuilder newComment = new StringBuilder();
 
+            final FunctionSymbol funcSym = binding.getCSymbol();
+            writer.print("<code> ");
+            writer.print(funcSym.getType().toString(symbolRenamed, tagNativeBinding));
+            writer.print(" </code> ");
+            
             newComment.append("<br>Part of ");
             if (0 == glEmitter.addExtensionsOfSymbols2Buffer(newComment, ", ", "; ", symbolRenamed, binding.getAliasedNames())) {
                 if (glEmitter.getGLConfig().getAllowNonGLExtensions()) {