2 files changed, 9 insertions, 3 deletions
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
index 28448d537..5b7c7da2c 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
@@ -480,8 +480,12 @@ public class EGLContext extends GLContextImpl {
         return GLContext.getGLProfile(sb, ctp);
     }
     /* pp */ int getContextOptions() { return ctxOptions; }
-    protected static void remapAvailableGLVersions(final AbstractGraphicsDevice fromDevice, final AbstractGraphicsDevice toDevice) {
-        GLContextImpl.remapAvailableGLVersions(fromDevice, toDevice);
+    /**
+     * Delegates to {@link GLContextImpl#remapAvailableGLVersions(AbstractGraphicsDevice, AbstractGraphicsDevice, boolean, int)}
+     */
+    protected static void remapAvailableGLVersions(final AbstractGraphicsDevice fromDevice, final AbstractGraphicsDevice toDevice,
+                                                   final boolean overwrite, final int ctpCriteria) {
+        GLContextImpl.remapAvailableGLVersions(fromDevice, toDevice, overwrite, ctpCriteria);
     }
     protected static synchronized void setMappedGLVersionListener(final MappedGLVersionListener mvl) {
         GLContextImpl.setMappedGLVersionListener(mvl);
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
index 026776769..b0c5d1928 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
@@ -659,7 +659,9 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
             }
 
             if( mappedToDefaultDevice[0] ) {
-                EGLContext.remapAvailableGLVersions(defaultDevice, adevice);
+                // map all GL versions (ES, CORE or COMPAT) to 'adevice' if not existing (no overwrite)
+                EGLContext.remapAvailableGLVersions(defaultDevice, adevice, false /* overwrite */,
+                        EGLContext.CTX_PROFILE_ES | EGLContext.CTX_PROFILE_CORE | EGLContext.CTX_PROFILE_COMPAT );
                 sr = defaultSharedResource;
             } else {
                 if( hasX11 ) {