Bug 1203: Implement regular EGL OpenGL Profile probing (ES* + GL*)

- GLProfile
  - Add 'hasGL234OnEGLImpl' handling, i.e. GL* profiles on EGL devices

  - Properly handle EGL's 'GLDynamicLookupHelper' queries for ES2, ES1 and GL* profiles,
    i.e. allow each one to fail seperately.

  - Merge computed EGL-Profile-Map (1) and Desktop-Profile-Map (2)
    per device, instead of just using the last computation,
    preserving and favoratizing the Desktop-Profile-Map.

- GLContextImpl.mapGLVersions(..): Map ES* profiles if having an EGLGraphicsDevice
  and not disabled via GLProfile.disableOpenGLES.

- EGLContext
  - createContextARBImpl(..): Use the EGL_CONTEXT_MINOR_VERSION_KHR if supported

  - GLContext* accessibility: Remove unused entries, add newly used ones

- EGLDrawableFactory
  - Fix a bug regarding detection of 'OpenGL' API for EGL

  - SharedResource: Use detailed knowledge of each profile

  - Only create one drawable and context for probing maximum,
    utilizing 'GLContextImpl.MappedGLVersionListener'
    to detect all mapped profiles for 'SharedResource' instance.

  - Detect whether the probed/mapped device
    can be mapped to the default-EGL-device, i.e.:
      - current device is not the default-EGL-device
      - default-EGL-device is valid and could be mapped (beforehand)
      - same connection
    In this case, no probing/mapping is performed
    and the default-EGL-device mapped data being reused and remapped
    to the requested device.

  - When mapping/probing, attempt to use a surfaceless context first,
    allowing same codepath for default-EGL-device and native-device (X11, ..).
    This avoids using pbuffer if using default-EGL-device
    and a dummy onscreen window if using a native-device (X11, ..).
    If this fails, continue as usual ..
      - default-EGL-device -> pbuffer
      - native-device (X11, ..) -> dummy onscreen window

4 files changed, 385 insertions, 272 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/GLProfile.java b/src/jogl/classes/com/jogamp/opengl/GLProfile.java
index 0bf290d78..520db78ad 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLProfile.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLProfile.java
@@ -39,6 +39,7 @@ package com.jogamp.opengl;
 
 import jogamp.opengl.Debug;
 import jogamp.opengl.GLDrawableFactoryImpl;
+import jogamp.opengl.GLDynamicLookupHelper;
 import jogamp.opengl.DesktopGLDynamicLookupHelper;
 
 import com.jogamp.common.ExceptionUtils;
@@ -242,7 +243,7 @@ public class GLProfile {
             initLock.unlock();
         }
         if(DEBUG) {
-            if( justInitialized && ( hasGL234Impl || hasGLES1Impl || hasGLES3Impl ) ) {
+            if( justInitialized && ( hasGL234Impl || hasGL234OnEGLImpl || hasGLES1Impl || hasGLES3Impl ) ) {
                 System.err.println(JoglVersion.getDefaultOpenGLInfo(defaultDevice, null, true));
             }
         }
@@ -1629,6 +1630,7 @@ public class GLProfile {
     private static /*final*/ boolean hasEGLFactory;
     private static /*final*/ boolean hasGLES3Impl;
     private static /*final*/ boolean hasGLES1Impl;
+    private static /*final*/ boolean hasGL234OnEGLImpl;
     private static /*final*/ Constructor<?> ctorGL234Impl;
     private static /*final*/ Constructor<?> ctorGLES3Impl;
     private static /*final*/ Constructor<?> ctorGLES1Impl;
@@ -1681,6 +1683,7 @@ public class GLProfile {
                 ctorGL234ProcAddr = null;
             }
         }
+        hasGL234OnEGLImpl = hasGL234Impl;
 
         // depends on hasEGLFactory
         {
@@ -1745,10 +1748,9 @@ public class GLProfile {
         try {
             desktopFactory = (GLDrawableFactoryImpl) GLDrawableFactory.getFactoryImpl(GL2);
             if(null != desktopFactory) {
-                final DesktopGLDynamicLookupHelper glLookupHelper = (DesktopGLDynamicLookupHelper) desktopFactory.getGLDynamicLookupHelper(GL2);
-                if(null!=glLookupHelper) {
-                    hasDesktopGLFactory = glLookupHelper.isLibComplete() && hasGL234Impl;
-                }
+                final DesktopGLDynamicLookupHelper glLookupHelper = (DesktopGLDynamicLookupHelper) desktopFactory.getGLDynamicLookupHelper(2, GLContext.CTX_PROFILE_COMPAT);
+                hasGL234Impl = null!=glLookupHelper && glLookupHelper.isLibComplete() && hasGL234Impl;
+                hasDesktopGLFactory = hasGL234Impl;
             }
         } catch (final LinkageError le) {
             t=le;
@@ -1780,10 +1782,14 @@ public class GLProfile {
             try {
                 eglFactory = (GLDrawableFactoryImpl) GLDrawableFactory.getFactoryImpl(GLES2);
                 if(null != eglFactory) {
-                    hasEGLFactory = true;
-                    // update hasGLES1Impl, hasGLES3Impl based on EGL
-                    hasGLES3Impl = null!=eglFactory.getGLDynamicLookupHelper(GLES2) && hasGLES3Impl;
-                    hasGLES1Impl = null!=eglFactory.getGLDynamicLookupHelper(GLES1) && hasGLES1Impl;
+                    // update hasGLES1Impl, hasGLES3Impl, hasGL234OnEGLImpl based on library completion
+                    final GLDynamicLookupHelper es2DynLookup = eglFactory.getGLDynamicLookupHelper(2, GLContext.CTX_PROFILE_ES);
+                    final GLDynamicLookupHelper es1DynLookup = eglFactory.getGLDynamicLookupHelper(1, GLContext.CTX_PROFILE_ES);
+                    final GLDynamicLookupHelper glXDynLookup = eglFactory.getGLDynamicLookupHelper(3, GLContext.CTX_PROFILE_CORE);
+                    hasGLES3Impl = null!=es2DynLookup && es2DynLookup.isLibComplete() && hasGLES3Impl;
+                    hasGLES1Impl = null!=es1DynLookup && es1DynLookup.isLibComplete() && hasGLES1Impl;
+                    hasGL234OnEGLImpl = null!=glXDynLookup && glXDynLookup.isLibComplete() && hasGL234OnEGLImpl;
+                    hasEGLFactory = hasGLES3Impl || hasGLES1Impl || hasGL234OnEGLImpl;
                 }
             } catch (final LinkageError le) {
                 t=le;
@@ -1803,6 +1809,8 @@ public class GLProfile {
 
         final AbstractGraphicsDevice defaultEGLDevice;
         if(null == eglFactory) {
+            hasEGLFactory    = false;
+            hasGL234OnEGLImpl= false;
             hasGLES3Impl     = false;
             hasGLES1Impl     = false;
             defaultEGLDevice = null;
@@ -1843,6 +1851,7 @@ public class GLProfile {
             System.err.println("GLProfile.init hasEGLFactory         "+hasEGLFactory);
             System.err.println("GLProfile.init hasGLES1Impl          "+hasGLES1Impl);
             System.err.println("GLProfile.init hasGLES3Impl          "+hasGLES3Impl);
+            System.err.println("GLProfile.init hasGL234OnEGLImpl     "+hasGL234OnEGLImpl);
             System.err.println("GLProfile.init defaultDevice         "+defaultDevice);
             System.err.println("GLProfile.init defaultDevice Desktop "+defaultDesktopDevice);
             System.err.println("GLProfile.init defaultDevice EGL     "+defaultEGLDevice);
@@ -1887,7 +1896,9 @@ public class GLProfile {
             return null != map.get(GL_DEFAULT);
         }
 
+        HashMap<String, GLProfile> mappedDesktopProfiles = null;
         boolean addedDesktopProfile = false;
+        HashMap<String, GLProfile> mappedEGLProfiles = null;
         boolean addedEGLProfile = false;
 
         final boolean deviceIsDesktopCompatible = hasDesktopGLFactory && desktopFactory.getIsDeviceCompatible(device);
@@ -1906,21 +1917,23 @@ public class GLProfile {
             if(null != sharedResourceThread) {
                 initLock.removeOwner(sharedResourceThread);
             }
-            if (DEBUG) {
-                System.err.println("GLProfile.initProfilesForDevice: "+device+": desktop Shared Ctx "+desktopSharedCtxAvail);
-            }
-            if(!desktopSharedCtxAvail) {
-                hasDesktopGLFactory = false;
-            } else if( !GLContext.getAvailableGLVersionsSet(device) ) {
-                throw new InternalError("Available GLVersions not set");
+            if( desktopSharedCtxAvail ) {
+                if( !GLContext.getAvailableGLVersionsSet(device) ) {
+                    throw new InternalError("Available GLVersions not set for "+device);
+                }
+                mappedDesktopProfiles = computeProfileMap(device, false /* desktopCtxUndef*/, false /* esCtxUndef */);
+                addedDesktopProfile = mappedDesktopProfiles.size() > 0;
+                if (DEBUG) {
+                    System.err.println("GLProfile.initProfilesForDevice: "+device+": desktop Shared Ctx "+desktopSharedCtxAvail+
+                            ", profiles: "+(addedDesktopProfile ? mappedDesktopProfiles.size() : 0));
+                }
             }
-            addedDesktopProfile = computeProfileMap(device, false /* desktopCtxUndef*/, false /* esCtxUndef */);
         }
 
         final boolean deviceIsEGLCompatible = hasEGLFactory && eglFactory.getIsDeviceCompatible(device);
 
         // also test GLES1, GLES2 and GLES3 on desktop, since we have implementations / emulations available.
-        if( deviceIsEGLCompatible && ( hasGLES3Impl || hasGLES1Impl ) ) {
+        if( deviceIsEGLCompatible ) {
             // 1st pretend we have all EGL profiles ..
             computeProfileMap(device, true /* desktopCtxUndef*/, true /* esCtxUndef */);
 
@@ -1934,18 +1947,17 @@ public class GLProfile {
             if(null != sharedResourceThread) {
                 initLock.removeOwner(sharedResourceThread);
             }
-            if(!eglSharedCtxAvail) {
-                // Remark: On Windows there is a libEGL.dll delivered w/ Chrome 15.0.874.121m and Firefox 8.0.1
-                // but it seems even EGL.eglInitialize(eglDisplay, null, null)
-                // fails in some scenarios (eg VirtualBox 4.1.6) w/ EGL error 0x3001 (EGL_NOT_INITIALIZED).
-                hasEGLFactory = false;
-                hasGLES3Impl = false;
-                hasGLES1Impl = false;
+            if( eglSharedCtxAvail ) {
+                if( !GLContext.getAvailableGLVersionsSet(device) ) {
+                    throw new InternalError("Available GLVersions not set for "+device);
+                }
+                mappedEGLProfiles = computeProfileMap(device, false /* desktopCtxUndef*/, false /* esCtxUndef */);
+                addedEGLProfile = mappedEGLProfiles.size() > 0;
             }
             if (DEBUG) {
-                System.err.println("GLProfile.initProfilesForDevice: "+device+": egl Shared Ctx "+eglSharedCtxAvail);
+                System.err.println("GLProfile.initProfilesForDevice: "+device+": egl Shared Ctx "+eglSharedCtxAvail+
+                                   ", profiles: "+(addedEGLProfile ? mappedEGLProfiles.size() : 0));
             }
-            addedEGLProfile = computeProfileMap(device, false /* desktopCtxUndef*/, false /* esCtxUndef */);
         }
 
         if( !addedDesktopProfile && !addedEGLProfile ) {
@@ -1959,6 +1971,15 @@ public class GLProfile {
                 System.err.println("GLProfile: hasGLES1Impl         "+hasGLES1Impl);
                 System.err.println("GLProfile: hasGLES3Impl         "+hasGLES3Impl);
             }
+        } else {
+            final HashMap<String, GLProfile> mappedAllProfiles = new HashMap<String, GLProfile>();
+            if( addedEGLProfile ) {
+                mappedAllProfiles.putAll(mappedEGLProfiles);
+            }
+            if( addedDesktopProfile ) {
+                mappedAllProfiles.putAll(mappedDesktopProfiles);
+            }
+            setProfileMap(device, mappedAllProfiles); // union
         }
 
         GLContext.setAvailableGLVersionsSet(device, true);
@@ -2029,7 +2050,7 @@ public class GLProfile {
         sb.append("]");
     }
 
-    private static boolean computeProfileMap(final AbstractGraphicsDevice device, final boolean desktopCtxUndef, final boolean esCtxUndef) {
+    private static HashMap<String, GLProfile> computeProfileMap(final AbstractGraphicsDevice device, final boolean desktopCtxUndef, final boolean esCtxUndef) {
         if (DEBUG) {
             System.err.println("GLProfile.init map "+device.getUniqueID()+", desktopCtxUndef "+desktopCtxUndef+", esCtxUndef "+esCtxUndef);
         }
@@ -2078,13 +2099,14 @@ public class GLProfile {
             _mappedProfiles.put(GL_DEFAULT, defaultGLProfileAny);
         }
         setProfileMap(device, _mappedProfiles);
-        return _mappedProfiles.size() > 0;
+        return _mappedProfiles;
     }
 
     /**
      * Returns the profile implementation
      */
     private static String computeProfileImpl(final AbstractGraphicsDevice device, final String profile, final boolean desktopCtxUndef, final boolean esCtxUndef, final boolean isHardwareRasterizer[]) {
+        final boolean hasAnyGL234Impl = hasGL234Impl || hasGL234OnEGLImpl;
         final boolean hardwareRasterizer[] = new boolean[1];
         if ( GL2ES1 == profile ) {
             final boolean gles1Available;
@@ -2096,7 +2118,7 @@ public class GLProfile {
                 gles1Available = false;
                 gles1HWAvailable = false;
             }
-            if(hasGL234Impl) {
+            if( hasAnyGL234Impl ) {
                 final boolean gl3bcAvailable = GLContext.isGL3bcAvailable(device, hardwareRasterizer);
                 final boolean gl3bcHWAvailable = gl3bcAvailable && hardwareRasterizer[0] ;
                 final boolean gl2Available = GLContext.isGL2Available(device, hardwareRasterizer);
@@ -2135,7 +2157,7 @@ public class GLProfile {
                 gles3Available = false;
                 gles3HWAvailable = false;
             }
-            if( hasGL234Impl ) {
+            if( hasAnyGL234Impl ) {
                 final boolean gl4bcAvailable = GLContext.isGL4bcAvailable(device, hardwareRasterizer);
                 final boolean gl4bcHWAvailable = gl4bcAvailable && hardwareRasterizer[0] ;
                 final boolean gl3Available = GLContext.isGL3Available(device, hardwareRasterizer);
@@ -2182,7 +2204,7 @@ public class GLProfile {
                 final boolean es3HardwareRasterizer[] = new boolean[1];
                 final boolean gles3Available = hasGLES3Impl && ( esCtxUndef || GLContext.isGLES3Available(device, es3HardwareRasterizer) );
                 final boolean gles3HWAvailable = gles3Available && es3HardwareRasterizer[0] ;
-                if( hasGL234Impl ) {
+                if( hasAnyGL234Impl ) {
                     final boolean gl4bcAvailable = GLContext.isGL4bcAvailable(device, hardwareRasterizer);
                     final boolean gl4bcHWAvailable = gl4bcAvailable && hardwareRasterizer[0] ;
                     final boolean glAnyHWAvailable = gl4bcHWAvailable ||
@@ -2203,7 +2225,7 @@ public class GLProfile {
                 }
             }
         } else if(GL2GL3 == profile) {
-            if(hasGL234Impl) {
+            if( hasAnyGL234Impl ) {
                 final boolean gl4Available = GLContext.isGL4Available(device, hardwareRasterizer);
                 final boolean gl4HWAvailable = gl4Available && hardwareRasterizer[0] ;
                 final boolean gl3Available = GLContext.isGL3Available(device, hardwareRasterizer);
@@ -2235,15 +2257,15 @@ public class GLProfile {
                     return GL2;
                 }
             }
-        } else if(GL4bc == profile && hasGL234Impl && ( desktopCtxUndef || GLContext.isGL4bcAvailable(device, isHardwareRasterizer))) {
+        } else if(GL4bc == profile && hasAnyGL234Impl && ( desktopCtxUndef || GLContext.isGL4bcAvailable(device, isHardwareRasterizer))) {
             return desktopCtxUndef ? GL4bc : GLContext.getAvailableGLProfileName(device, 4, GLContext.CTX_PROFILE_COMPAT);
-        } else if(GL4 == profile && hasGL234Impl && ( desktopCtxUndef || GLContext.isGL4Available(device, isHardwareRasterizer))) {
+        } else if(GL4 == profile && hasAnyGL234Impl && ( desktopCtxUndef || GLContext.isGL4Available(device, isHardwareRasterizer))) {
             return desktopCtxUndef ? GL4 : GLContext.getAvailableGLProfileName(device, 4, GLContext.CTX_PROFILE_CORE);
-        } else if(GL3bc == profile && hasGL234Impl && ( desktopCtxUndef || GLContext.isGL3bcAvailable(device, isHardwareRasterizer))) {
+        } else if(GL3bc == profile && hasAnyGL234Impl && ( desktopCtxUndef || GLContext.isGL3bcAvailable(device, isHardwareRasterizer))) {
             return desktopCtxUndef ? GL3bc : GLContext.getAvailableGLProfileName(device, 3, GLContext.CTX_PROFILE_COMPAT);
-        } else if(GL3 == profile && hasGL234Impl && ( desktopCtxUndef || GLContext.isGL3Available(device, isHardwareRasterizer))) {
+        } else if(GL3 == profile && hasAnyGL234Impl && ( desktopCtxUndef || GLContext.isGL3Available(device, isHardwareRasterizer))) {
             return desktopCtxUndef ? GL3 : GLContext.getAvailableGLProfileName(device, 3, GLContext.CTX_PROFILE_CORE);
-        } else if(GL2 == profile && hasGL234Impl && ( desktopCtxUndef || GLContext.isGL2Available(device, isHardwareRasterizer))) {
+        } else if(GL2 == profile && hasAnyGL234Impl && ( desktopCtxUndef || GLContext.isGL2Available(device, isHardwareRasterizer))) {
             return desktopCtxUndef ? GL2 : GLContext.getAvailableGLProfileName(device, 2, GLContext.CTX_PROFILE_COMPAT);
         } else if(GLES3 == profile && hasGLES3Impl && ( esCtxUndef || GLContext.isGLES3Available(device, isHardwareRasterizer))) {
             return esCtxUndef ? GLES3 : GLContext.getAvailableGLProfileName(device, 3, GLContext.CTX_PROFILE_ES);
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index dcab9ed5b..fff6d58e0 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -1128,6 +1128,40 @@ public abstract class GLContextImpl extends GLContext {
         boolean hasGL2   = false;
         boolean hasGL4   = false;
         boolean hasGL3   = false;
+        boolean hasES3   = false;
+        boolean hasES2   = false;
+        boolean hasES1   = false;
+
+        if( (device instanceof EGLGraphicsDevice) && !GLProfile.disableOpenGLES ) {
+            if( !hasES3) {
+                hasES3   = createContextARBMapVersionsAvailable(device, 3, CTX_PROFILE_ES);    // ES3
+                success |= hasES3;
+                if( hasES3 ) {
+                    if( 0 == ( CTX_IMPL_ACCEL_SOFT & ctxOptions ) ) {
+                        // Map hw-accel ES3 to all lower core profiles: ES2
+                        mapAvailableGLVersion(device, 2, CTX_PROFILE_ES, ctxVersion, ctxOptions, glRendererQuirks);
+                        if( PROFILE_ALIASING ) {
+                            hasES2   = true;
+                        }
+                    }
+                    resetStates(false); // clean context states, since creation was temporary
+                }
+            }
+            if( !hasES2) {
+                hasES2   = createContextARBMapVersionsAvailable(device, 2, CTX_PROFILE_ES);    // ES2
+                success |= hasES2;
+                if( hasES3 ) {
+                    resetStates(false); // clean context states, since creation was temporary
+                }
+            }
+            if( !hasES1) {
+                hasES1   = createContextARBMapVersionsAvailable(device, 1, CTX_PROFILE_ES);    // ES1
+                success |= hasES1;
+                if( hasES1 ) {
+                    resetStates(false); // clean context states, since creation was temporary
+                }
+            }
+        }
 
         // Even w/ PROFILE_ALIASING, try to use true core GL profiles
         // ensuring proper user behavior across platforms due to different feature sets!
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
index eba8b1df3..8c86f5199 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
@@ -236,11 +236,11 @@ public class EGLContext extends GLContextImpl {
 
             int index = ctx_attribs_idx_major + 2;
 
-            /** if( ctDesktopGL && reqMinor >= 0 ) { // FIXME: No minor version probing for ES currently!
+            if( reqMinor >= 0 ) {
                 attribs.put(index + 0, EGLExt.EGL_CONTEXT_MINOR_VERSION_KHR);
                 attribs.put(index + 1, reqMinor);
                 index += 2;
-            } */
+            }
 
             if( ctDesktopGL && ( useMajor > 3 || useMajor == 3 && reqMinor >= 2 ) ) {
                 attribs.put(index + 0, EGLExt.EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR);
@@ -463,52 +463,32 @@ public class EGLContext extends GLContextImpl {
     // Accessible ..
     //
 
-    /* pp */ void mapCurrentAvailableGLESVersion(final AbstractGraphicsDevice device) {
-        mapStaticGLESVersion(device, ctxVersion.getMajor(), ctxVersion.getMinor(), ctxOptions);
+    /* pp */ static final boolean isGLES1(final int majorVersion, final int ctxOptions) {
+        return 0 != ( ctxOptions & GLContext.CTX_PROFILE_ES ) && majorVersion == 1 ;
     }
-    /* pp */ int getContextOptions() { return ctxOptions; }
-    /* pp */ static void mapStaticGLESVersion(final AbstractGraphicsDevice device, final GLCapabilitiesImmutable caps) {
-        final GLProfile glp = caps.getGLProfile();
-        final int[] reqMajorCTP = new int[2];
-        GLContext.getRequestMajorAndCompat(glp, reqMajorCTP);
-        if( glp.isGLES() ) {
-            if( reqMajorCTP[0] >= 3 ) {
-                reqMajorCTP[1] |= GLContext.CTX_IMPL_ES3_COMPAT | GLContext.CTX_IMPL_ES2_COMPAT | GLContext.CTX_IMPL_FBO ;
-            } else if( reqMajorCTP[0] >= 2 ) {
-                reqMajorCTP[1] |= GLContext.CTX_IMPL_ES2_COMPAT | GLContext.CTX_IMPL_FBO ;
-            }
-        }
-        if( !caps.getHardwareAccelerated() ) {
-            reqMajorCTP[1] |= GLContext.CTX_IMPL_ACCEL_SOFT;
+    /* pp */ static final boolean isGLES2ES3(final int majorVersion, final int ctxOptions) {
+        if( 0 != ( ctxOptions & CTX_PROFILE_ES ) ) {
+            return 2 == majorVersion || 3 == majorVersion;
+        } else {
+            return false;
         }
-        mapStaticGLESVersion(device, reqMajorCTP[0], 0, reqMajorCTP[1]);
     }
-    /* pp */ static void mapStaticGLESVersion(final AbstractGraphicsDevice device, final int major, final int minor, final int ctp) {
-        if( 0 != ( ctp & GLContext.CTX_PROFILE_ES) ) {
-            // ES1, ES2, ES3, ..
-            mapStaticGLESVersion(device, major /* reqMajor */, major, minor, ctp);
-            if( 3 == major ) {
-                // map ES2 -> ES3
-                mapStaticGLESVersion(device, 2 /* reqMajor */, major, minor, ctp);
-            }
-        }
+    /* pp */ static final boolean isGLDesktop(final int ctxOptions) {
+        return 0 != (ctxOptions & (CTX_PROFILE_COMPAT|CTX_PROFILE_CORE));
     }
-    private static void mapStaticGLESVersion(final AbstractGraphicsDevice device, final int reqMajor, final int major, final int minor, final int ctp) {
-        GLContext.mapAvailableGLVersion(device, reqMajor, GLContext.CTX_PROFILE_ES, major, minor, ctp);
-        if(! ( device instanceof EGLGraphicsDevice ) ) {
-            final EGLGraphicsDevice eglDevice = new EGLGraphicsDevice(device.getHandle(), EGL.EGL_NO_DISPLAY, device.getConnection(), device.getUnitID(), null);
-            GLContext.mapAvailableGLVersion(eglDevice, reqMajor, GLContext.CTX_PROFILE_ES, major, minor, ctp);
-        }
+    protected static StringBuilder getGLProfile(final StringBuilder sb, final int ctp) {
+        return GLContext.getGLProfile(sb, ctp);
     }
-    protected static String getGLVersion(final int major, final int minor, final int ctp, final String gl_version) {
-        return GLContext.getGLVersion(major, minor, ctp, gl_version);
+    /* pp */ int getContextOptions() { return ctxOptions; }
+    protected static void remapAvailableGLVersions(final AbstractGraphicsDevice fromDevice, final AbstractGraphicsDevice toDevice) {
+        GLContextImpl.remapAvailableGLVersions(fromDevice, toDevice);
     }
-
-    protected static boolean getAvailableGLVersionsSet(final AbstractGraphicsDevice device) {
-        return GLContext.getAvailableGLVersionsSet(device);
+    protected static synchronized void setMappedGLVersionListener(final MappedGLVersionListener mvl) {
+        GLContextImpl.setMappedGLVersionListener(mvl);
     }
-    protected static void setAvailableGLVersionsSet(final AbstractGraphicsDevice device, final boolean set) {
-        GLContext.setAvailableGLVersionsSet(device, set);
+
+    protected static String getGLVersion(final int major, final int minor, final int ctp, final String gl_version) {
+        return GLContext.getGLVersion(major, minor, ctp, gl_version);
     }
 
     protected static String toHexString(final int hex) {
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
index 1bfb26260..958ab2ead 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
@@ -102,6 +102,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
     private static String defaultConnection = null;
     private static EGLGraphicsDevice defaultDevice = null;
     private static EGLFeatures defaultDeviceEGLFeatures = null;
+    private static SharedResource defaultSharedResource = null;
 
     private static final boolean isANGLE(final GLDynamicLookupHelper dl) {
         if(Platform.OSType.WINDOWS == PlatformPropsImpl.OS_TYPE) {
@@ -140,7 +141,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                 final String eglClientAPIStr = EGL.eglQueryString(eglDisplay, EGL.EGL_CLIENT_APIS);
                 if( hasEGL_1_4 ) {
                     final String[] eglClientAPIs = eglClientAPIStr.split("\\s");
-                    for(int i=eglClientAPIs.length-1; i>=0; i--) {
+                    for(int i=eglClientAPIs.length-1; !_hasGLAPI && i>=0; i--) {
                         _hasGLAPI = eglClientAPIs[i].equals("OpenGL");
                     }
                 }
@@ -408,10 +409,11 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
             for(final Iterator<String> keyI = keys.iterator(); keyI.hasNext(); i++) {
                 final String key = keyI.next();
                 final SharedResource sr = (SharedResource) sharedMap.get(key);
-                System.err.println("EGLDrawableFactory.map["+i+"] "+key+" -> "+sr.getDevice()+", avail "+sr.isAvailable+
-                                   "gln   [quirks "+sr.rendererQuirksGLn+", ctp "+EGLContext.getGLVersion(3, 0, sr.ctpGLn, null)+"], "+
-                                   "es1   [quirks "+sr.rendererQuirksES1+", ctp "+EGLContext.getGLVersion(1, 0, sr.ctpES1, null)+"], "+
-                                   "es2/3 [quirks "+sr.rendererQuirksES3ES2+", ctp "+EGLContext.getGLVersion(2, 0, sr.ctpES3ES2, null)+"]");
+                System.err.println("EGLDrawableFactory.MapGLVersion.map["+i+"] "+key+" -> "+sr.getDevice()+", avail "+sr.isAvailable+", "+
+                                   "es1 [avail "+sr.isAvailableES1+", quirks "+sr.rendererQuirksES1+", ctp "+EGLContext.getGLVersion(1, 0, sr.ctpES1, null)+"], "+
+                                   "es2 [avail "+sr.isAvailableES2+", quirks "+sr.rendererQuirksES2+", ctp "+EGLContext.getGLVersion(2, 0, sr.ctpES2, null)+"], "+
+                                   "es3 [avail "+sr.isAvailableES3+", quirks "+sr.rendererQuirksES3+", ctp "+EGLContext.getGLVersion(2, 0, sr.ctpES3, null)+"], "+
+                                   "gln [avail "+sr.isAvailableGLn+", quirks "+sr.rendererQuirksGLn+", ctp "+EGLContext.getGLVersion(3, 0, sr.ctpGLn, null)+"]");
             }
             ;
         }
@@ -422,32 +424,40 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
 
     static class SharedResource implements SharedResourceRunner.Resource {
       private EGLGraphicsDevice device;
-      // private final EGLContext contextES1;
-      // private final EGLContext contextES2;
-      // private final EGLContext contextES3;
       final boolean isAvailable;
-      final GLRendererQuirks rendererQuirksGLn;
+      final boolean isAvailableES1;
+      final boolean isAvailableES2;
+      final boolean isAvailableES3;
+      final boolean isAvailableGLn;
       final GLRendererQuirks rendererQuirksES1;
-      final GLRendererQuirks rendererQuirksES3ES2;
-      final int ctpGLn;
+      final GLRendererQuirks rendererQuirksES2;
+      final GLRendererQuirks rendererQuirksES3;
+      final GLRendererQuirks rendererQuirksGLn;
       final int ctpES1;
-      final int ctpES3ES2;
+      final int ctpES2;
+      final int ctpES3;
+      final int ctpGLn;
 
-      SharedResource(final EGLGraphicsDevice dev, final boolean isAvailable,
-                     final GLRendererQuirks rendererQuirksGLn, final int ctpGLn,
-                     final GLRendererQuirks rendererQuirksES1, final int ctpES1,
-                     final GLRendererQuirks rendererQuirksES3ES2, final int ctpES3ES2) {
+      SharedResource(final EGLGraphicsDevice dev,
+                     final boolean isAvailableES1, final GLRendererQuirks rendererQuirksES1, final int ctpES1,
+                     final boolean isAvailableES2, final GLRendererQuirks rendererQuirksES2, final int ctpES2,
+                     final boolean isAvailableES3, final GLRendererQuirks rendererQuirksES3, final int ctpES3,
+                     final boolean isAvailableGLn, final GLRendererQuirks rendererQuirksGLn, final int ctpGLn) {
           this.device = dev;
-          this.isAvailable = isAvailable;
-
-          this.rendererQuirksGLn = rendererQuirksGLn;
-          this.ctpGLn = ctpGLn;
+          this.isAvailable = isAvailableES1 || isAvailableES2 || isAvailableES3 || isAvailableGLn;
 
+          this.isAvailableES1 = isAvailableES1;
           this.rendererQuirksES1 = rendererQuirksES1;
           this.ctpES1 = ctpES1;
-
-          this.rendererQuirksES3ES2 = rendererQuirksES3ES2;
-          this.ctpES3ES2 = ctpES3ES2;
+          this.isAvailableES2 = isAvailableES2;
+          this.rendererQuirksES2 = rendererQuirksES2;
+          this.ctpES2 = ctpES2;
+          this.isAvailableES3 = isAvailableES3;
+          this.rendererQuirksES3 = rendererQuirksES3;
+          this.ctpES3 = ctpES3;
+          this.isAvailableGLn = isAvailableGLn;
+          this.rendererQuirksGLn = rendererQuirksGLn;
+          this.ctpGLn = ctpGLn;
       }
 
       @Override
@@ -472,8 +482,10 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
       @Override
       public GLRendererQuirks getRendererQuirks(final GLProfile glp) {
           if( null == glp ) {
-              if( null != rendererQuirksES3ES2 ) {
-                  return rendererQuirksES3ES2;
+              if( null != rendererQuirksES3 ) {
+                  return rendererQuirksES3;
+              } else if( null != rendererQuirksES2 ) {
+                  return rendererQuirksES2;
               } else if( null != rendererQuirksES1 ) {
                   return rendererQuirksES1;
               } else {
@@ -483,8 +495,10 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
               return rendererQuirksGLn;
           } else if( glp.isGLES1() ) {
               return rendererQuirksES1;
-          } else {
-              return rendererQuirksES3ES2;
+          } else if( glp.isGLES2() ) {
+              return rendererQuirksES2;
+          } else /* if( glp.isGLES3() ) */ {
+              return rendererQuirksES3;
           }
       }
   }
@@ -512,78 +526,124 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                 System.err.println("EGLDrawableFactory.MapGLVersions: device "+adevice);
             }
 
-            final GLRendererQuirks[] rendererQuirksES1 = new GLRendererQuirks[] { null };
-            final GLRendererQuirks[] rendererQuirksES3ES2 = new GLRendererQuirks[] { null };
-            final GLRendererQuirks[] rendererQuirksGLn = new GLRendererQuirks[] { null };
-            final int[] ctpES1 = new int[] { EGLContext.CTX_PROFILE_ES };
-            final int[] ctpES3ES2 = new int[] { EGLContext.CTX_PROFILE_ES };
-            final int[] ctpGLn = new int[] { EGLContext.CTX_PROFILE_CORE };
-
-            if ( DEBUG_SHAREDCTX ) {
-                System.err.println("EGLDrawableFactory.createShared(): device "+adevice);
-            }
-
-            boolean madeCurrentES1 = false;
-            boolean madeCurrentES2 = false;
-            boolean madeCurrentES3 = false;
-            boolean madeCurrentGLn = false;
-
-            if( null != eglGLnDynamicLookupHelper ) {
-                // OpenGL 3.1 core -> GL3, will utilize normal desktop profile mapping
-                final int[] major = { 3 };
-                final int[] minor = { 1 }; // FIXME: No minor version probing for ES currently!
-                madeCurrentGLn = mapAvailableEGLESConfig(adevice, major, minor,
-                                                         ctpGLn, rendererQuirksGLn) && 0 != major[0];
+            final boolean initDefaultDevice;
+            if( 0 == defaultDevice.getHandle() ) { // Note: GLProfile always triggers EGL device initialization first!
+                initDefaultDevice = true;
+                defaultDevice.open();
+                defaultDeviceEGLFeatures = new EGLFeatures(defaultDevice);
+                if ( DEBUG_SHAREDCTX ) {
+                    System.err.println("EGLDrawableFactory.MapGLVersions: defaultDevice "+defaultDevice);
+                    System.err.println("EGLDrawableFactory.MapGLVersions: defaultDevice EGLFeatures "+defaultDeviceEGLFeatures);
+                }
+                // Probe for GLRendererQuirks.SingletonEGLDisplayOnly
+                final boolean singletonEGLDisplayOnlyVendor, singletonEGLDisplayOnlyProbe;
+                /* if( defaultDeviceEGLFeatures.vendor.contains("NVIDIA") ) { // May use for later ..
+                    singletonEGLDisplayOnlyVendor=true;
+                    singletonEGLDisplayOnlyProbe=false;
+                } else */ {
+                    singletonEGLDisplayOnlyVendor=false;
+                    final long secondEGLDisplay = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
+                    singletonEGLDisplayOnlyProbe = EGL.EGL_NO_DISPLAY == secondEGLDisplay;
+                }
+                if( singletonEGLDisplayOnlyVendor || singletonEGLDisplayOnlyProbe ) {
+                    final int quirk = GLRendererQuirks.SingletonEGLDisplayOnly;
+                    GLRendererQuirks.addStickyDeviceQuirk(adevice, quirk);
+                    EGLDisplayUtil.setSingletonEGLDisplayOnly(true);
+                    if ( DEBUG_SHAREDCTX ) {
+                        if( singletonEGLDisplayOnlyVendor ) {
+                            System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Vendor: "+defaultDeviceEGLFeatures);
+                        } else if( singletonEGLDisplayOnlyProbe ) {
+                            System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Second eglGetDisplay(EGL_DEFAULT_DISPLAY) failed");
+                        }
+                    }
+                }
             } else {
-                madeCurrentGLn = false;
+                initDefaultDevice = false;
+                if( null == defaultSharedResource ) {
+                    throw new InternalError("XXX: defaultDevice "+defaultDevice+", adevice "+adevice);
+                }
             }
-            EGLContext.setAvailableGLVersionsSet(adevice, true);
 
-            if( null != eglES1DynamicLookupHelper ) {
-                final int[] major = { 1 };
-                final int[] minor = { 0 };
-                madeCurrentES1 = mapAvailableEGLESConfig(adevice, major, minor,
-                                                         ctpES1, rendererQuirksES1) && 1 == major[0];
-            } else {
-                madeCurrentES1 = false;
-            }
-            if( null != eglES2DynamicLookupHelper ) {
-                // ES3 Query
-                final int[] major = { 3 };
-                final int[] minor = { 0 };
-                madeCurrentES3 = mapAvailableEGLESConfig(adevice, major, minor,
-                                                         ctpES3ES2, rendererQuirksES3ES2) && 3 == major[0];
-                if( !madeCurrentES3 ) {
-                    // ES2 Query, may result in ES3
-                    major[0] = 2;
-                    if( mapAvailableEGLESConfig(adevice, major, minor,
-                                                ctpES3ES2, rendererQuirksES3ES2) )
-                    {
-                        switch( major[0] ) {
-                            case 2: madeCurrentES2 = true; break;
-                            case 3: madeCurrentES3 = true; break;
-                            default: throw new InternalError("XXXX Got "+major[0]);
+            final boolean[] mappedToDefaultDevice = { false };
+            final GLRendererQuirks[] rendererQuirksES1 = new GLRendererQuirks[] { null };
+            final GLRendererQuirks[] rendererQuirksES2 = new GLRendererQuirks[] { null };
+            final GLRendererQuirks[] rendererQuirksES3 = new GLRendererQuirks[] { null };
+            final GLRendererQuirks[] rendererQuirksGLn = new GLRendererQuirks[] { null };
+            final int[] ctpES1 = new int[] { 0 };
+            final int[] ctpES2 = new int[] { 0 };
+            final int[] ctpES3 = new int[] { 0 };
+            final int[] ctpGLn = new int[] { 0 };
+            final boolean[] madeCurrentES1 = { false };
+            final boolean[] madeCurrentES2 = { false };
+            final boolean[] madeCurrentES3 = { false };
+            final boolean[] madeCurrentGLn = { false };
+
+            final GLContextImpl.MappedGLVersionListener mvl = new GLContextImpl.MappedGLVersionListener() {
+                @Override
+                public void glVersionMapped(final MappedGLVersion e) {
+                    if ( DEBUG_SHAREDCTX ) {
+                        System.err.println("EGLDrawableFactory.MapGLVersions: Mapped: "+e);
+                    }
+                    if ( EGLContext.isGLES2ES3(e.ctxVersion.getMajor(), e.ctxOptions) ) {
+                        if( e.ctxVersion.getMajor() == 3 ) {
+                            madeCurrentES3[0] = true;
+                            rendererQuirksES3[0] = e.quirks;
+                            ctpES3[0] = e.ctxOptions;
                         }
+                        madeCurrentES2[0] = true;
+                        rendererQuirksES2[0] = e.quirks;
+                        ctpES2[0] = e.ctxOptions;
+                    } else if ( EGLContext.isGLES1(e.ctxVersion.getMajor(), e.ctxOptions) ) {
+                        madeCurrentES1[0] = true;
+                        rendererQuirksES1[0] = e.quirks;
+                        ctpES1[0] = e.ctxOptions;
+                    } else if( EGLContext.isGLDesktop(e.ctxOptions) ) {
+                        madeCurrentGLn[0] = true;
+                        rendererQuirksGLn[0] = e.quirks;
+                        ctpGLn[0] = e.ctxOptions;
                     }
                 }
+            };
+            final SharedResource sr;
+            final EGLGraphicsDevice[] eglDevice = { null };
+            final boolean mapSuccess;
+            EGLContext.setMappedGLVersionListener(mvl);
+            try {
+                // Query triggers profile mapping!
+                mapSuccess = mapAvailableEGLESConfig(adevice, mappedToDefaultDevice, eglDevice);
+            } finally {
+                EGLContext.setMappedGLVersionListener(null);
             }
 
-            if( hasX11 ) {
-                handleDontCloseX11DisplayQuirk(rendererQuirksES1[0]);
-                handleDontCloseX11DisplayQuirk(rendererQuirksES3ES2[0]);
+            if( mappedToDefaultDevice[0] ) {
+                EGLContext.remapAvailableGLVersions(defaultDevice, adevice);
+                sr = defaultSharedResource;
+            } else {
+                if( hasX11 ) {
+                    handleDontCloseX11DisplayQuirk(rendererQuirksES1[0]);
+                    handleDontCloseX11DisplayQuirk(rendererQuirksGLn[0]);
+                    handleDontCloseX11DisplayQuirk(rendererQuirksES3[0]);
+                    handleDontCloseX11DisplayQuirk(rendererQuirksES2[0]);
+                }
+                sr = new SharedResource(eglDevice[0],
+                            madeCurrentES1[0], rendererQuirksES1[0], ctpES1[0],
+                            madeCurrentES2[0], rendererQuirksES2[0], ctpES2[0],
+                            madeCurrentES3[0], rendererQuirksES3[0], ctpES3[0],
+                            madeCurrentGLn[0], rendererQuirksGLn[0], ctpGLn[0]);
+                if( initDefaultDevice ) {
+                    defaultSharedResource = sr;
+                }
             }
-            final SharedResource sr = new SharedResource(defaultDevice,
-                                                         madeCurrentGLn || madeCurrentES1 || madeCurrentES2 || madeCurrentES3,
-                                                         rendererQuirksGLn[0], ctpGLn[0],
-                                                         rendererQuirksES1[0], ctpES1[0],
-                                                         rendererQuirksES3ES2[0], ctpES3ES2[0]);
 
             if ( DEBUG_SHAREDCTX ) {
-                System.err.println("EGLDrawableFactory.createShared: devices: queried nativeTK "+QUERY_EGL_ES_NATIVE_TK+", adevice " + adevice + ", defaultDevice " + defaultDevice);
-                System.err.println("EGLDrawableFactory.createShared: context GLn: " + madeCurrentGLn + ", quirks "+rendererQuirksGLn[0]);
-                System.err.println("EGLDrawableFactory.createShared: context ES1: " + madeCurrentES1 + ", quirks "+rendererQuirksES1[0]);
-                System.err.println("EGLDrawableFactory.createShared: context ES2: " + madeCurrentES2 + ", quirks "+rendererQuirksES3ES2[0]);
-                System.err.println("EGLDrawableFactory.createShared: context ES3: " + madeCurrentES3 + ", quirks "+rendererQuirksES3ES2[0]);
+                System.err.println("EGLDrawableFactory.MapGLVersions: mapSuccess "+mapSuccess+", mappedToDefaultDevice "+mappedToDefaultDevice[0]);
+                System.err.println("EGLDrawableFactory.MapGLVersions: defDevice  : " + defaultDevice);
+                System.err.println("EGLDrawableFactory.MapGLVersions: adevice    : " + adevice);
+                System.err.println("EGLDrawableFactory.MapGLVersions: eglDevice  : " + sr.device);
+                System.err.println("EGLDrawableFactory.MapGLVersions: context ES1: " + sr.isAvailableES1 + ", quirks "+sr.rendererQuirksES1);
+                System.err.println("EGLDrawableFactory.MapGLVersions: context ES2: " + sr.isAvailableES2 + ", quirks "+sr.rendererQuirksES2);
+                System.err.println("EGLDrawableFactory.MapGLVersions: context ES3: " + sr.isAvailableES3 + ", quirks "+sr.rendererQuirksES3);
+                System.err.println("EGLDrawableFactory.MapGLVersions: context GLn: " + sr.isAvailableGLn + ", quirks "+sr.rendererQuirksGLn);
                 dumpMap();
             }
             return sr;
@@ -596,9 +656,12 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
         }
 
         private boolean mapAvailableEGLESConfig(final AbstractGraphicsDevice adevice,
-                                                final int[] majorVersion, final int[] minorVersion,
-                                                final int[] ctxProfile, final GLRendererQuirks[] rendererQuirks) {
-            final String profileString = EGLContext.getGLProfile(majorVersion[0], minorVersion[0], ctxProfile[0]);
+                                                final boolean[] mapsADeviceToDefaultDevice,
+                                                final EGLGraphicsDevice[] resEGLDevice) {
+            final int majorVersion = 2;
+            final int minorVersion = 0;
+            final int ctxProfile = EGLContext.CTX_PROFILE_ES;
+            final String profileString = EGLContext.getGLProfile(majorVersion, minorVersion, ctxProfile);
 
             if ( !GLProfile.isAvailable(adevice, profileString) ) {
                 if ( DEBUG_SHAREDCTX ) {
@@ -608,104 +671,126 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
             }
             final GLProfile glp = GLProfile.get(adevice, profileString) ;
             final GLDrawableFactoryImpl desktopFactory = (GLDrawableFactoryImpl) GLDrawableFactory.getDesktopFactory();
-            final boolean initDefaultDevice = 0 == defaultDevice.getHandle(); // Note: GLProfile always triggers EGL device initialization first!
-            final boolean mapsADeviceToDefaultDevice = !QUERY_EGL_ES_NATIVE_TK || initDefaultDevice ||
-                                                       null == desktopFactory;
-                                                       // FIXME || adevice instanceof EGLGraphicsDevice ;
+
+            final GLCapabilities reqCapsAny = new GLCapabilities(glp);
+            reqCapsAny.setRedBits(5); reqCapsAny.setGreenBits(5); reqCapsAny.setBlueBits(5); reqCapsAny.setAlphaBits(0);
+            reqCapsAny.setDoubleBuffered(false);
+            final GLCapabilitiesImmutable reqCapsPBuffer = GLGraphicsConfigurationUtil.fixGLPBufferGLCapabilities(reqCapsAny);
+            final List<GLCapabilitiesImmutable> defaultDevicePBufferCapsL = getAvailableEGLConfigs(defaultDevice, reqCapsPBuffer);
+            final boolean defaultDeviceHasPBuffer = defaultDevicePBufferCapsL.size() > 0;
+
+            final boolean useDefaultDevice = adevice == defaultDevice;
+
+            mapsADeviceToDefaultDevice[0] = !useDefaultDevice &&
+                                            null != defaultSharedResource && defaultSharedResource.isAvailable &&
+                                            defaultConnection.equals(adevice.getConnection());
+
             if ( DEBUG_SHAREDCTX ) {
-                System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig: "+profileString+" ( "+majorVersion[0]+" ), "+
-                        "mapsADeviceToDefaultDevice "+mapsADeviceToDefaultDevice+
-                        " (QUERY_EGL_ES_NATIVE_TK "+QUERY_EGL_ES_NATIVE_TK+", initDefaultDevice "+initDefaultDevice+", hasDesktopFactory "+(null != desktopFactory)+
+                System.err.println("EGLDrawableFactory.MapGLVersions: "+profileString+" ( "+majorVersion+" ), "+
+                        "mapsADeviceToDefaultDevice "+mapsADeviceToDefaultDevice[0]+
+                        " (useDefaultDevice "+useDefaultDevice+", defaultDeviceHasPBuffer "+defaultDeviceHasPBuffer+", hasDesktopFactory "+(null != desktopFactory)+
                         ", isEGLGraphicsDevice "+(adevice instanceof EGLGraphicsDevice)+")");
             }
 
-            boolean hasPBuffer;
-            EGLGraphicsDevice eglDevice = null;
-            EGLFeatures eglFeatures = null;
-            NativeSurface surface = null;
-            ProxySurface upstreamSurface = null; // X11, GLX, ..
-            ProxySurface downstreamSurface = null; // EGL
+            if( mapsADeviceToDefaultDevice[0] ) {
+                return true;
+            }
+
+            final boolean defaultNoSurfacelessCtx = GLRendererQuirks.existStickyDeviceQuirk(defaultDevice, GLRendererQuirks.NoSurfacelessCtx);
             boolean success = false;
-            try {
-                final GLCapabilities reqCapsAny = new GLCapabilities(glp);
-                reqCapsAny.setRedBits(5); reqCapsAny.setGreenBits(5); reqCapsAny.setBlueBits(5); reqCapsAny.setAlphaBits(0);
-                reqCapsAny.setDoubleBuffered(false);
-
-                if( mapsADeviceToDefaultDevice ) {
-                    // In this branch, any non EGL device is mapped to EGL default shared resources (default behavior).
-                    // Only one default shared resource instance is ever be created.
-                    if( initDefaultDevice ) {
-                        defaultDevice.open();
-                        defaultDeviceEGLFeatures = new EGLFeatures(defaultDevice);
-
-                        // Probe for GLRendererQuirks.SingletonEGLDisplayOnly
-                        final long secondEGLDisplay = EGL.eglGetDisplay(EGL.EGL_DEFAULT_DISPLAY);
-                        if ( EGL.EGL_NO_DISPLAY == secondEGLDisplay ) {
-                            final int quirk = GLRendererQuirks.SingletonEGLDisplayOnly;
-                            GLRendererQuirks.addStickyDeviceQuirk(adevice, quirk);
-                            EGLDisplayUtil.setSingletonEGLDisplayOnly(true);
+            final boolean hasKHRSurfacelessTried;
+            if( defaultDeviceEGLFeatures.hasKHRSurfaceless && !defaultNoSurfacelessCtx ) {
+                hasKHRSurfacelessTried = true;
+                final AbstractGraphicsDevice zdevice = useDefaultDevice ? defaultDevice : adevice; // reuse
+                final EGLSurface zeroSurface = createSurfacelessImpl(zdevice, false, reqCapsAny, reqCapsAny, null, 64, 64);
+                resEGLDevice[0] = (EGLGraphicsDevice) zeroSurface.getGraphicsConfiguration().getScreen().getDevice();
+                if ( DEBUG_SHAREDCTX ) {
+                    System.err.println("EGLDrawableFactory-MapGLVersions.0: "+resEGLDevice[0]);
+                }
+                EGLDrawable zeroDrawable = null;
+                EGLContext context = null;
+                try {
+                    zeroDrawable = (EGLDrawable) createOnscreenDrawableImpl ( zeroSurface );
+                    zeroDrawable.setRealized(true);
+
+                    context = (EGLContext) zeroDrawable.createContext(null);
+                    if (null == context) {
+                        throw new GLException("Couldn't create shared context for drawable: "+zeroDrawable);
+                    }
+                    // Triggers initial mapping, if not done yet
+                    if( GLContext.CONTEXT_NOT_CURRENT != context.makeCurrent() ) { // could cause exception
+                        // context.isCurrent() !
+                        final GL gl = context.getGL();
+                        final String glVersionString = gl.glGetString(GL.GL_VERSION);
+                        if(null != glVersionString) {
+                            success = true;
+                        } else {
+                            setNoSurfacelessCtxQuirk(context);
+                        }
+                    } else if ( DEBUG_SHAREDCTX ) {
+                        System.err.println("EGLDrawableFactory-MapGLVersions.0: NOT_CURRENT: "+resEGLDevice[0]+", "+context);
+                    }
+                } catch (final Throwable t) {
+                    if ( DEBUG_SHAREDCTX ) {
+                        System.err.println("EGLDrawableFactory-MapGLVersions.0: INFO: context create/makeCurrent failed");
+                        t.printStackTrace();
+                    }
+                } finally {
+                    if( null != context ) {
+                        try {
+                            context.destroy();
+                        } catch (final GLException gle) {
                             if ( DEBUG_SHAREDCTX ) {
-                                System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Second eglGetDisplay(EGL_DEFAULT_DISPLAY) failed");
+                                System.err.println("EGLDrawableFactory-MapGLVersions.0: INFO: destroy caught exception:");
+                                gle.printStackTrace();
                             }
                         }
                     }
-                    eglDevice = defaultDevice; // reuse
+                    if( null != zeroDrawable ) {
+                        zeroDrawable.setRealized(false);
+                    }
+                    if( null != zeroSurface ) {
+                        zeroSurface.destroyNotify();
+                    }
+                }
+                if( success ) {
+                    return true;
+                }
+            } else { // hasKHRSurfaceless
+                hasKHRSurfacelessTried = false;
+            }
+            EGLFeatures eglFeatures = null;
+            NativeSurface surface = null;
+            ProxySurface upstreamSurface = null; // X11, GLX, ..
+            ProxySurface downstreamSurface = null; // EGL
+            try {
+                if( useDefaultDevice && defaultDeviceHasPBuffer ) {
+                    // Map any non EGL device to EGL default shared resources (default behavior), using a pbuffer surface
+                    resEGLDevice[0] = defaultDevice; // reuse
                     eglFeatures = defaultDeviceEGLFeatures;
                     if ( DEBUG_SHAREDCTX ) {
-                        System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig.0: "+eglFeatures);
+                        System.err.println("EGLDrawableFactory-MapGLVersions.1: "+resEGLDevice[0]);
+                        System.err.println("EGLDrawableFactory-MapGLVersions.1: "+eglFeatures);
                     }
 
-                    if( !glp.isGLES() && !eglFeatures.hasGLAPI ) {
-                        if ( DEBUG_SHAREDCTX ) {
-                            System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig() OpenGL API not supported (1)");
-                        }
-                    } else {
-                        final GLCapabilitiesImmutable reqCapsPBuffer = GLGraphicsConfigurationUtil.fixGLPBufferGLCapabilities(reqCapsAny);
-                        final List<GLCapabilitiesImmutable> availablePBufferCapsL = getAvailableEGLConfigs(eglDevice, reqCapsPBuffer);
-                        hasPBuffer = availablePBufferCapsL.size() > 0;
-
-                        // attempt to created the default shared resources ..
-                        if( hasPBuffer ) {
-                            // 2nd case create defaultDevice shared resource using pbuffer surface
-                            downstreamSurface = createDummySurfaceImpl(eglDevice, false, reqCapsPBuffer, reqCapsPBuffer, null, 64, 64); // egl pbuffer offscreen
-                            if( null != downstreamSurface ) {
-                                downstreamSurface.createNotify();
-                                surface = downstreamSurface;
-                            }
-                        } else {
-                            // 3rd case fake creation of defaultDevice shared resource, no pbuffer available
-                            final List<GLCapabilitiesImmutable> capsAnyL = getAvailableEGLConfigs(eglDevice, reqCapsAny);
-                            if(capsAnyL.size() > 0) {
-                                final GLCapabilitiesImmutable chosenCaps = capsAnyL.get(0);
-                                EGLContext.mapStaticGLESVersion(eglDevice, chosenCaps);
-                                success = true;
-                            }
-                            if ( DEBUG_SHAREDCTX ) {
-                                System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig() no pbuffer config available, detected !pbuffer config: "+success);
-                                EGLGraphicsConfigurationFactory.printCaps("!PBufferCaps", capsAnyL, System.err);
-                            }
-                        }
+                    downstreamSurface = createDummySurfaceImpl(resEGLDevice[0], false, reqCapsPBuffer, reqCapsPBuffer, null, 64, 64);
+                    if( null != downstreamSurface ) {
+                        downstreamSurface.createNotify();
+                        surface = downstreamSurface;
                     }
-                } else {
-                    // 4th case always creates a true mapping of given device to EGL
+                } else if( adevice != defaultDevice ) {
+                    // Create a true mapping of given device to EGL
                     upstreamSurface = desktopFactory.createDummySurface(adevice, reqCapsAny, null, 64, 64); // X11, WGL, .. dummy window
                     if(null != upstreamSurface) {
                         upstreamSurface.createNotify();
-                        eglDevice = EGLDisplayUtil.eglCreateEGLGraphicsDevice(upstreamSurface);
-                        eglDevice.open();
-                        eglFeatures = new EGLFeatures(eglDevice);
+                        resEGLDevice[0] = EGLDisplayUtil.eglCreateEGLGraphicsDevice(upstreamSurface);
+                        resEGLDevice[0].open();
+                        eglFeatures = new EGLFeatures(resEGLDevice[0]);
                         if ( DEBUG_SHAREDCTX ) {
-                            System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig.1: "+eglFeatures);
-                        }
-                        if( !glp.isGLES() && !eglFeatures.hasGLAPI ) {
-                            if ( DEBUG_SHAREDCTX ) {
-                                System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig() OpenGL API not supported (2)");
-                            }
-                            // disposed at finalized: eglDevice, upstreamSurface
-                        } else {
-                            hasPBuffer = true;
-                            surface = upstreamSurface;
+                            System.err.println("EGLDrawableFactory-MapGLVersions.2: "+resEGLDevice[0]);
+                            System.err.println("EGLDrawableFactory-MapGLVersions.2: "+eglFeatures);
                         }
+                        surface = upstreamSurface;
                     }
                 }
 
@@ -722,16 +807,14 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                             throw new GLException("Couldn't create shared context for drawable: "+drawable);
                         }
 
+                        // Triggers initial mapping, if not done yet
                         if( GLContext.CONTEXT_NOT_CURRENT != context.makeCurrent() ) { // could cause exception
                             // context.isCurrent() !
-                            final String glVersionString = context.getGL().glGetString(GL.GL_VERSION);
+                            final GL gl = context.getGL();
+                            final String glVersionString = gl.glGetString(GL.GL_VERSION);
                             if(null != glVersionString) {
-                                context.mapCurrentAvailableGLESVersion(eglDevice);
-                                if(eglDevice != adevice) {
-                                    context.mapCurrentAvailableGLESVersion(adevice);
-                                }
-
-                                if( eglFeatures.hasKHRSurfaceless &&
+                                success = true;
+                                if( !hasKHRSurfacelessTried && eglFeatures.hasKHRSurfaceless &&
                                     ( context.isGLES() || context.getGLVersionNumber().compareTo(GLContext.Version3_0) >= 0 )
                                   )
                                 {
@@ -741,21 +824,15 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                                 } else {
                                     setNoSurfacelessCtxQuirk(context);
                                 }
-                                rendererQuirks[0] = context.getRendererQuirks();
-                                ctxProfile[0] = context.getContextOptions();
-                                majorVersion[0] = context.getGLVersionNumber().getMajor();
-                                minorVersion[0] = context.getGLVersionNumber().getMinor();
-                                success = true;
-                            } else {
-                                // Oops .. something is wrong
-                                if ( DEBUG_SHAREDCTX ) {
-                                    System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig: "+eglDevice+", "+context.getGLVersion()+" - VERSION is null, dropping availability!");
-                                }
+                            } else if ( DEBUG_SHAREDCTX ) {
+                                System.err.println("EGLDrawableFactory-MapGLVersions.12: NULL VERSION: "+resEGLDevice[0]+", "+context.getGLVersion());
                             }
+                        } else if ( DEBUG_SHAREDCTX ) {
+                            System.err.println("EGLDrawableFactory-MapGLVersions.12: NOT_CURRENT: "+resEGLDevice[0]+", "+context);
                         }
                     } catch (final Throwable t) {
                         if ( DEBUG_SHAREDCTX ) {
-                            System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig: INFO: context create/makeCurrent failed");
+                            System.err.println("EGLDrawableFactory-MapGLVersions.12: INFO: context create/makeCurrent failed");
                             t.printStackTrace();
                         }
                     } finally {
@@ -764,7 +841,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                                 context.destroy();
                             } catch (final GLException gle) {
                                 if ( DEBUG_SHAREDCTX ) {
-                                    System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig: INFO: destroy caught exception:");
+                                    System.err.println("EGLDrawableFactory-MapGLVersions.12: INFO: destroy caught exception:");
                                     gle.printStackTrace();
                                 }
                             }
@@ -784,12 +861,12 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                 }
                 success = false;
             } finally {
-                if(null != downstreamSurface) {
+                if( null != downstreamSurface ) {
                     downstreamSurface.destroyNotify();
                 }
-                if( defaultDevice != eglDevice ) { // don't close default device
-                    if(null != eglDevice) {
-                        eglDevice.close();
+                if( defaultDevice != resEGLDevice[0] ) { // don't close default device
+                    if(null != resEGLDevice[0]) {
+                        resEGLDevice[0].close();
                     }
                 }
                 if(null != upstreamSurface) {