2 files changed, 16 insertions, 9 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
index b64bb375a..3c1175420 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
@@ -363,14 +363,17 @@ public class EGLContext extends GLContextImpl {
     }
 
     @Override
-    protected final void updateGLXProcAddressTable() {
+    protected final void updateGLXProcAddressTable(final String contextFQN, final GLDynamicLookupHelper dlh) {
+        if( null == dlh ) {
+            throw new GLException("No GLDynamicLookupHelper for "+this);
+        }
         final AbstractGraphicsConfiguration aconfig = drawable.getNativeSurface().getGraphicsConfiguration();
         final AbstractGraphicsDevice adevice = aconfig.getScreen().getDevice();
         final String key = "EGL-"+adevice.getUniqueID();
+        // final String key = contextFQN;
         if (DEBUG) {
           System.err.println(getThreadName() + ": Initializing EGLextension address table: "+key);
         }
-
         ProcAddressTable table = null;
         synchronized(mappedContextTypeObjectLock) {
             table = mappedGLXProcAddress.get( key );
@@ -385,7 +388,7 @@ public class EGLContext extends GLContextImpl {
             }
         } else {
             eglExtProcAddressTable = new EGLExtProcAddressTable(new GLProcAddressResolver());
-            resetProcAddressTable(eglExtProcAddressTable);
+            resetProcAddressTable(eglExtProcAddressTable, dlh);
             synchronized(mappedContextTypeObjectLock) {
                 mappedGLXProcAddress.put(key, eglExtProcAddressTable);
                 if(DEBUG) {
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
index a45a7efe0..937334513 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
@@ -867,17 +867,21 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
     }
 
     @Override
-    public GLDynamicLookupHelper getGLDynamicLookupHelper(final String esProfile) {
+    public final GLDynamicLookupHelper getGLDynamicLookupHelper(final int majorVersion, final int contextOptions) {
         final GLDynamicLookupHelper res;
-        if ( GLProfile.GLES2 == esProfile || GLProfile.GLES3 == esProfile ) {
+        if ( EGLContext.isGLES2ES3(majorVersion, contextOptions) ) {
             res = eglES2DynamicLookupHelper;
-        } else if ( GLProfile.GLES1 == esProfile ) {
+        } else if ( EGLContext.isGLES1(majorVersion, contextOptions) ) {
             res = eglES1DynamicLookupHelper;
-        } else {
+        } else if( EGLContext.isGLDesktop(contextOptions) ) {
             res = eglGLnDynamicLookupHelper;
+        } else {
+            throw new IllegalArgumentException("neither GLES1, GLES2, GLES3 nor desktop GL has been specified: "+majorVersion+" ("+EGLContext.getGLProfile(new StringBuilder(), contextOptions).toString());
         }
-        if( null == res ) {
-            throw new GLException("No lookup for esProfile "+esProfile);
+        if( DEBUG_SHAREDCTX ) {
+            if( null == res ) {
+                System.err.println("EGLDrawableFactory.getGLDynamicLookupHelper: NULL for profile "+majorVersion+" ("+EGLContext.getGLProfile(new StringBuilder(), contextOptions).toString());
+            }
         }
         return res;
     }