JOGL: HashMap ProcAddressTable for all GL profiles incl GLX/WGL/CGL/EGL

Reduce (performance/footprint) overhead of ProcAddressTable recreation,
instead use a hashmap (major, minor, profile) -> ProcAddressTable.

Remove GL2ES12 implementation profile, redundant.

7 files changed, 145 insertions, 62 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLibraryBundleInfo.java b/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLibraryBundleInfo.java
index a33f395a5..5cacf5087 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLibraryBundleInfo.java
@@ -28,12 +28,10 @@
  
 package com.jogamp.opengl.impl;
 
-import com.jogamp.common.os.DynamicLibraryBundleInfo;
 import java.util.List;
 import java.util.ArrayList;
 
 public abstract class DesktopGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundleInfo {
-    private static int posGlueLibGL2ES12;
     private static int posGlueLibGLDESKTOP;
     private static List/*<String>*/ glueLibNames;
     static {
@@ -41,17 +39,10 @@ public abstract class DesktopGLDynamicLibraryBundleInfo extends GLDynamicLibrary
 
         glueLibNames.addAll(getGlueLibNamesPreload());
 
-        posGlueLibGL2ES12 = glueLibNames.size();
-        glueLibNames.add("jogl_gl2es12");
-
         posGlueLibGLDESKTOP = glueLibNames.size();
         glueLibNames.add("jogl_desktop");
     }
 
-    public static final int getGlueLibPosGL2ES12() { 
-        return posGlueLibGL2ES12; 
-    }
-
     public static final int getGlueLibPosGLDESKTOP() { 
         return posGlueLibGLDESKTOP; 
     }
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLookupHelper.java
index 511e0518d..08821910f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/DesktopGLDynamicLookupHelper.java
@@ -48,10 +48,6 @@ public class DesktopGLDynamicLookupHelper extends GLDynamicLookupHelper {
         return isToolLibLoaded() && isGlueLibLoaded(DesktopGLDynamicLibraryBundleInfo.getGlueLibPosGLDESKTOP());
     }
 
-    public boolean hasGLES12Binding() {
-        return isToolLibLoaded() && isGlueLibLoaded(DesktopGLDynamicLibraryBundleInfo.getGlueLibPosGL2ES12());
-    }
-
     public synchronized boolean loadGLULibrary() {
         /** hacky code .. where all platform GLU libs are tried ..*/
         if(null==gluLib) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 3d4c601fe..5f4a9879b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -474,7 +474,10 @@ public abstract class GLContextImpl extends GLContext {
     boolean compat = glp.isGL2(); // incl GL3bc and GL4bc
     
     int key = compose8bit(reqMajor, compat?CTX_PROFILE_COMPAT:CTX_PROFILE_CORE, 0, 0);
-    int val = mappedVersionsAvailable.get( key );
+    int val;
+    synchronized(mappedVersionsAvailableLock) {
+        val = mappedVersionsAvailable.get( key );
+    }
     long _ctx = 0;
     if(val>0) {
         int _major = getComposed8bit(val, 1);
@@ -489,23 +492,23 @@ public abstract class GLContextImpl extends GLContext {
     return _ctx;
   }
 
-    private void mapGLVersions() {
-        if (!mappedVersionsAvailableSet) {
-            synchronized (mappedVersionsAvailableLock) {
-                if (!mappedVersionsAvailableSet) {
-                    createContextARBMapVersionsAvailable(4, false /* core   */);  // GL4
-                    createContextARBMapVersionsAvailable(4, true  /* compat */);  // GL4bc
-                    createContextARBMapVersionsAvailable(3, false /* core   */);  // GL3
-                    createContextARBMapVersionsAvailable(3, true  /* compat */);  // GL3bc
-                    createContextARBMapVersionsAvailable(2, true  /* compat */);  // GL2
-                    mappedVersionsAvailableSet = true;
-                    if (DEBUG) {
-                        System.err.println(getThreadName() + ": !!! createContextARB: SET mappedVersionsAvailableSet " + mappedVersionsAvailableSet);
-                    }
+  private void mapGLVersions() {
+    if (!mappedVersionsAvailableSet) {
+        synchronized (mappedVersionsAvailableLock) {
+            if (!mappedVersionsAvailableSet) {
+                createContextARBMapVersionsAvailable(4, false /* core   */);  // GL4
+                createContextARBMapVersionsAvailable(4, true  /* compat */);  // GL4bc
+                createContextARBMapVersionsAvailable(3, false /* core   */);  // GL3
+                createContextARBMapVersionsAvailable(3, true  /* compat */);  // GL3bc
+                createContextARBMapVersionsAvailable(2, true  /* compat */);  // GL2
+                mappedVersionsAvailableSet = true;
+                if (DEBUG) {
+                    System.err.println(getThreadName() + ": !!! createContextARB: SET mappedVersionsAvailableSet " + mappedVersionsAvailableSet);
                 }
             }
         }
     }
+  }
 
   private final void createContextARBMapVersionsAvailable(int reqMajor, boolean compat)
   {
@@ -649,6 +652,10 @@ public abstract class GLContextImpl extends GLContext {
     return ReflectionUtil.createInstance(glp.getGLImplBaseClassName()+suffix, cstrArgTypes, cstrArgs, getClass().getClassLoader());
   }
 
+  private boolean verifyInstance(GLProfile glp, String suffix, Object instance) {
+    return ReflectionUtil.instanceOf(instance, glp.getGLImplBaseClassName()+suffix);
+  }
+
   /** Create the GL for this context. */
   protected GL createGL(GLProfile glp) {
     GL gl = (GL) createInstance(glp, "Impl", new Class[] { GLProfile.class, GLContextImpl.class }, new Object[] { glp, this } );
@@ -729,8 +736,8 @@ public abstract class GLContextImpl extends GLContext {
 
   /** Helper routine which resets a ProcAddressTable generated by the
       GLEmitter by looking up anew all of its function pointers. */
-  protected void resetProcAddressTable(Object table) {
-    ((ProcAddressTable)table).reset(getDrawableImpl().getGLDynamicLookupHelper() );
+  protected void resetProcAddressTable(ProcAddressTable table) {
+    table.reset(getDrawableImpl().getGLDynamicLookupHelper() );
   }
 
   /**
@@ -769,15 +776,35 @@ public abstract class GLContextImpl extends GLContext {
     if (DEBUG) {
       System.err.println(getThreadName() + ": !!! Initializing OpenGL extension address table for " + this);
     }
-    if (glProcAddressTable == null) {
-      glProcAddressTable = (ProcAddressTable) createInstance(gl.getGLProfile(), "ProcAddressTable", 
-                                                             new Class[] { FunctionAddressResolver.class } , 
-                                                             new Object[] { new GLProcAddressResolver() } );
-      // FIXME: cache ProcAddressTables by capability bits so we can
-      // share them among contexts with the same capabilities
-    }
-    resetProcAddressTable(getGLProcAddressTable());
 
+    int key = compose8bit(major, minor, ctp, 0);
+    ProcAddressTable table = null;
+    synchronized(mappedProcAddressLock) {
+        table = (ProcAddressTable) mappedGLProcAddress.get( key );
+        if(null != table && !verifyInstance(gl.getGLProfile(), "ProcAddressTable", table)) {
+            throw new InternalError("GLContext GL ProcAddressTable mapped key("+major+","+minor+","+ctp+") -> "+
+                  table.getClass().getName()+" not matching "+gl.getGLProfile().getGLImplBaseClassName());
+        }
+    }
+    if(null != table) {
+        glProcAddressTable = table;
+        if(DEBUG) {
+            System.err.println("GLContext GL ProcAddressTable reusing key("+major+","+minor+","+ctp+") -> "+table.hashCode());
+        }
+    } else {
+        if (glProcAddressTable == null) {
+          glProcAddressTable = (ProcAddressTable) createInstance(gl.getGLProfile(), "ProcAddressTable",
+                                                                 new Class[] { FunctionAddressResolver.class } ,
+                                                                 new Object[] { new GLProcAddressResolver() } );
+        }
+        resetProcAddressTable(getGLProcAddressTable());
+        synchronized(mappedProcAddressLock) {
+            mappedGLProcAddress.put(key, getGLProcAddressTable());
+            if(DEBUG) {
+                System.err.println("GLContext GL ProcAddressTable mapping key("+major+","+minor+","+ctp+") -> "+getGLProcAddressTable().hashCode());
+            }
+        }
+    }
     setContextVersion(major, minor, ctp);
 
     extensionAvailability.reset();
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
index 5671b033d..65f16089b 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
@@ -35,7 +35,6 @@
 
 package com.jogamp.opengl.impl.egl;
 
-import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.impl.*;
 import com.jogamp.gluegen.runtime.ProcAddressTable;
@@ -200,12 +199,30 @@ public abstract class EGLContext extends GLContextImpl {
         eglQueryStringInitialized = false;
         eglQueryStringAvailable = false;
 
-        if (eglExtProcAddressTable == null) {
-          // FIXME: cache ProcAddressTables by capability bits so we can
-          // share them among contexts with the same capabilities
-          eglExtProcAddressTable = new EGLExtProcAddressTable(new GLProcAddressResolver());
-        }          
-        resetProcAddressTable(getEGLExtProcAddressTable());
+        int key = compose8bit(major, minor, ctp, 0);
+        EGLExtProcAddressTable table = null;
+        synchronized(mappedProcAddressLock) {
+            table = (EGLExtProcAddressTable) mappedGLXProcAddress.get( key );
+        }
+        if(null != table) {
+            eglExtProcAddressTable = table;
+            if(DEBUG) {
+                System.err.println("GLContext EGL ProcAddressTable reusing key("+major+","+minor+","+ctp+") -> "+table.hashCode());
+            }
+        } else {
+            if (eglExtProcAddressTable == null) {
+              // FIXME: cache ProcAddressTables by capability bits so we can
+              // share them among contexts with the same capabilities
+              eglExtProcAddressTable = new EGLExtProcAddressTable(new GLProcAddressResolver());
+            }
+            resetProcAddressTable(getEGLExtProcAddressTable());
+            synchronized(mappedProcAddressLock) {
+                mappedGLXProcAddress.put(key, getEGLExtProcAddressTable());
+                if(DEBUG) {
+                    System.err.println("GLContext EGL ProcAddressTable mapping key("+major+","+minor+","+ctp+") -> "+getEGLExtProcAddressTable().hashCode());
+                }
+            }
+        }
         super.updateGLProcAddressTable(major, minor, ctp);
     }
   
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
index 1bb07cf9c..ad7dac85f 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -228,12 +228,30 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     if (DEBUG) {
       System.err.println("!!! Initializing CGL extension address table");
     }
-    if (cglExtProcAddressTable == null) {
-      // FIXME: cache ProcAddressTables by capability bits so we can
-      // share them among contexts with the same capabilities
-      cglExtProcAddressTable = new CGLExtProcAddressTable(new GLProcAddressResolver());
-    }          
-    resetProcAddressTable(getCGLExtProcAddressTable());
+    int key = compose8bit(major, minor, ctp, 0);
+    CGLExtProcAddressTable table = null;
+    synchronized(mappedProcAddressLock) {
+        table = (CGLExtProcAddressTable) mappedGLXProcAddress.get( key );
+    }
+    if(null != table) {
+        cglExtProcAddressTable = table;
+        if(DEBUG) {
+            System.err.println("GLContext CGL ProcAddressTable reusing key("+major+","+minor+","+ctp+") -> "+table.hashCode());
+        }
+    } else {
+        if (cglExtProcAddressTable == null) {
+          // FIXME: cache ProcAddressTables by capability bits so we can
+          // share them among contexts with the same capabilities
+          cglExtProcAddressTable = new CGLExtProcAddressTable(new GLProcAddressResolver());
+        }
+        resetProcAddressTable(getCGLExtProcAddressTable());
+        synchronized(mappedProcAddressLock) {
+            mappedGLXProcAddress.put(key, getCGLExtProcAddressTable());
+            if(DEBUG) {
+                System.err.println("GLContext CGL ProcAddressTable mapping key("+major+","+minor+","+ctp+") -> "+getCGLExtProcAddressTable().hashCode());
+            }
+        }
+    }
     super.updateGLProcAddressTable(major, minor, ctp);
   }
 	
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
index 65a8e8ac3..027fb0065 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -340,12 +340,30 @@ public class WindowsWGLContext extends GLContextImpl {
     wglMakeContextCurrentInitialized=false;
     wglMakeContextCurrentAvailable=false;
 
-    if (wglExtProcAddressTable == null) {
-      // FIXME: cache ProcAddressTables by OpenGL context type bits so we can
-      // share them among contexts classes (GL4, GL4bc, GL3, GL3bc, ..)
-      wglExtProcAddressTable = new WGLExtProcAddressTable(new GLProcAddressResolver());
-    }          
-    resetProcAddressTable(getWGLExtProcAddressTable());
+    int key = compose8bit(major, minor, ctp, 0);
+    WGLExtProcAddressTable table = null;
+    synchronized(mappedProcAddressLock) {
+        table = (WGLExtProcAddressTable) mappedGLXProcAddress.get( key );
+    }
+    if(null != table) {
+        wglExtProcAddressTable = table;
+        if(DEBUG) {
+            System.err.println("GLContext WGL ProcAddressTable reusing key("+major+","+minor+","+ctp+") -> "+table.hashCode());
+        }
+    } else {
+        if (wglExtProcAddressTable == null) {
+          // FIXME: cache ProcAddressTables by OpenGL context type bits so we can
+          // share them among contexts classes (GL4, GL4bc, GL3, GL3bc, ..)
+          wglExtProcAddressTable = new WGLExtProcAddressTable(new GLProcAddressResolver());
+        }
+        resetProcAddressTable(getWGLExtProcAddressTable());
+        synchronized(mappedProcAddressLock) {
+            mappedGLXProcAddress.put(key, getWGLExtProcAddressTable());
+            if(DEBUG) {
+                System.err.println("GLContext WGL ProcAddressTable mapping key("+major+","+minor+","+ctp+") -> "+getWGLExtProcAddressTable().hashCode());
+            }
+        }
+    }
     super.updateGLProcAddressTable(major, minor, ctp);
   }
   
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index 3cf691493..697ee6353 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -392,12 +392,28 @@ public abstract class X11GLXContext extends GLContextImpl {
     glXQueryExtensionsStringInitialized = false;
     glXQueryExtensionsStringAvailable = false;
 
-    if (glXExtProcAddressTable == null) {
-      // FIXME: cache ProcAddressTables by OpenGL context type bits so we can
-      // share them among contexts classes (GL4, GL4bc, GL3, GL3bc, ..)
-      glXExtProcAddressTable = new GLXExtProcAddressTable(new GLProcAddressResolver());
-    }          
-    resetProcAddressTable(getGLXExtProcAddressTable());
+    int key = compose8bit(major, minor, ctp, 0);
+    GLXExtProcAddressTable table = null;
+    synchronized(mappedProcAddressLock) {
+        table = (GLXExtProcAddressTable) mappedGLXProcAddress.get( key );
+    }
+    if(null != table) {
+        glXExtProcAddressTable = table;
+        if(DEBUG) {
+            System.err.println("GLContext GLX ProcAddressTable reusing key("+major+","+minor+","+ctp+") -> "+table.hashCode());
+        }
+    } else {
+        if (glXExtProcAddressTable == null) {
+          glXExtProcAddressTable = new GLXExtProcAddressTable(new GLProcAddressResolver());
+        }
+        resetProcAddressTable(getGLXExtProcAddressTable());
+        synchronized(mappedProcAddressLock) {
+            mappedGLXProcAddress.put(key, getGLXExtProcAddressTable());
+            if(DEBUG) {
+                System.err.println("GLContext GLX ProcAddressTable mapping key("+major+","+minor+","+ctp+") -> "+getGLXExtProcAddressTable().hashCode());
+            }
+        }
+    }
     super.updateGLProcAddressTable(major, minor, ctp);
   }