Add Support for GL 4.3 (Bug 716) and ES 3.0 (Bug 717)

ES3 / GL4.3:

- Update all EGL, GLX, WGL and GL (desktop and mobile) khronos headers to latest version.
  - GL3/gl3* -> GL/glcorearb*

  - Explicitly preserve ES2_compatibility and ES3_compatibility in header,
    most extension grouping was removed in new headers.

  - Always load all GLHeader to ensure proper extension association across all profiles.

  - Unified method signatures

  - Added GL_EXT_map_buffer_range to core

  - Using common 'glMapBufferImpl(..)' for all glMapBuffer(..) and glMapBufferRange(..) impl.

  - Init necessary fields of GL instances via 'finalizeInit()' called by reflection, if exist.
    This allows removing initialization checks, i.e. for all buffer validations.

- BuildStaticGLInfo: Can handle new GL header structure, i.e. one CPP extenstion block incl. define + funcs.

- GLJavaMethodBindingEmitter: Simply print the

- No GL duplication due to new intermediate interfaces, see below

- OO lineare inheritance (Added GL2ES3, GL3ES3 and GL4ES3 intemediates):
  GLBase - GL - GL2ES2 - GLES2
  GLBase - GL - GL2ES2 - GL2GL3 - [ GL2, GL3 ]
  GLBase - GL - GL2ES2 - GL2ES3 - GL3ES3 - [ GL3 ]
  GLBase - GL - GL2ES2 - GL2ES3 - GL3ES3 - GL4ES3 - [ GLES3, GL4, .. ]

- Expose 'usable' intermediate interfaces GL3ES3 and GL4ES3 in GLBase/GLProfile/GLContext
  via is*() and get*().

- GLContext*:
  - isGL3core() is true if [ GL4, GL3, GLES3 ] (added GLES3)

  - Added ctxProfile argument to allow handling ES versions:
    - getMaxMajor(..), getMaxMinor(..), isValidGLVersion(..) and decrementGLVersion(..)
    - mapGLVersions(..) prepared for ES ARB/KHR validation

  - EGLContext checks ES3 (via old ctx's GL_VERSION)

- ExtensionAvailabilityCache adds GL_ES_Version_X_Y for ES.

- Prelim tests w/ Mesa 9.1.3
  GL Version     3.0 (ES profile, ES2 compat, ES3 compat, FBO, hardware) - OpenGL ES 3.0 Mesa 9.1.3 [GL 3.0.0, vendor 9.1.3 (Mesa 9.1.3)]

- TODO:
  - Use KHR_create_context in EGLContext.createContextARBImpl(..)
  - More tests (Mobile, ..)

+++

Misc:

- GLContext*:
  - Complete glAllocateMemoryNV w/ glFreeMemoryNV.

5 files changed, 140 insertions, 61 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
index b54ed6599..e7977e3fb 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
@@ -171,7 +171,7 @@ public class EGLContext extends GLContextImpl {
 
         try {
             // might be unavailable on EGL < 1.2
-            if(!EGL.eglBindAPI(EGL.EGL_OPENGL_ES_API)) {
+            if( !EGL.eglBindAPI(EGL.EGL_OPENGL_ES_API) ) {
                 throw new GLException("Catched: eglBindAPI to ES failed , error "+toHexString(EGL.eglGetError()));
             }
         } catch (GLException glex) {
@@ -188,18 +188,21 @@ public class EGLContext extends GLContextImpl {
         }
 
         final IntBuffer contextAttrsNIO;
+        final int contextVersionReq, contextVersionAttr;
         {
-            final int[] contextAttrs = new int[] {
-                    EGL.EGL_CONTEXT_CLIENT_VERSION, -1,
-                    EGL.EGL_NONE
-            };
-            if (glProfile.usesNativeGLES2()) {
-                contextAttrs[1] = 2;
-            } else if (glProfile.usesNativeGLES1()) {
-                contextAttrs[1] = 1;
+            if ( glProfile.usesNativeGLES3() ) {
+                contextVersionReq = 3;
+                contextVersionAttr = 2;
+            } else if ( glProfile.usesNativeGLES2() ) {
+                contextVersionReq = 2;
+                contextVersionAttr = 2;
+            } else if ( glProfile.usesNativeGLES1() ) {
+                contextVersionReq = 1;
+                contextVersionAttr = 1;
             } else {
                 throw new GLException("Error creating OpenGL context - invalid GLProfile: "+glProfile);
             }
+            final int[] contextAttrs = new int[] { EGL.EGL_CONTEXT_CLIENT_VERSION, contextVersionAttr, EGL.EGL_NONE };
             contextAttrsNIO = Buffers.newDirectIntBuffer(contextAttrs);
         }
         contextHandle = EGL.eglCreateContext(eglDisplay, eglConfig, shareWithHandle, contextAttrsNIO);
@@ -219,8 +222,7 @@ public class EGLContext extends GLContextImpl {
             throw new GLException("Error making context " +
                                   toHexString(contextHandle) + " current: error code " + toHexString(EGL.eglGetError()));
         }
-        setGLFunctionAvailability(true, glProfile.usesNativeGLES2() ? 2 : 1, 0, CTX_PROFILE_ES, false);
-        return true;
+        return setGLFunctionAvailability(true, contextVersionReq, 0, CTX_PROFILE_ES, contextVersionReq>=3); // strict match for es >= 3
     }
 
     @Override
@@ -292,16 +294,25 @@ public class EGLContext extends GLContextImpl {
         final GLProfile glp = caps.getGLProfile();
         final int[] reqMajorCTP = new int[2];
         GLContext.getRequestMajorAndCompat(glp, reqMajorCTP);
-        if(glp.isGLES() && reqMajorCTP[0] >= 2) {
-            reqMajorCTP[1] |= GLContext.CTX_IMPL_ES2_COMPAT | GLContext.CTX_IMPL_FBO ;
+        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()) {
+        if( !caps.getHardwareAccelerated() ) {
             reqMajorCTP[1] |= GLContext.CTX_IMPL_ACCEL_SOFT;
         }
         mapStaticGLVersion(device, reqMajorCTP[0], 0, reqMajorCTP[1]);
     }    
-    /* pp */ static void mapStaticGLESVersion(AbstractGraphicsDevice device, int major) {
-        int ctp = ( 2 == major ) ? ( GLContext.CTX_PROFILE_ES | GLContext.CTX_IMPL_ES2_COMPAT | GLContext.CTX_IMPL_FBO ) : ( GLContext.CTX_PROFILE_ES );  
+    /* pp */ static void mapStaticGLESVersion(AbstractGraphicsDevice device, final int major) {
+        int ctp = GLContext.CTX_PROFILE_ES;
+        if( major >= 3 ) {
+            ctp |= GLContext.CTX_IMPL_ES3_COMPAT | GLContext.CTX_IMPL_ES2_COMPAT | GLContext.CTX_IMPL_FBO ;
+        } else if( major >= 2 ) {
+            ctp |= GLContext.CTX_IMPL_ES2_COMPAT | GLContext.CTX_IMPL_FBO ;
+        }
         mapStaticGLVersion(device, major, 0, ctp);
     }
     /* pp */ static void mapStaticGLVersion(AbstractGraphicsDevice device, int major, int minor, int ctp) {
@@ -343,9 +354,13 @@ public class EGLContext extends GLContextImpl {
         throw new GLException("Not yet implemented");
     }
 
-
     @Override
-    public ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
+    public final ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority) {
+        throw new GLException("Should not call this");
+    }
+    
+    @Override
+    public final void glFreeMemoryNV(ByteBuffer pointer) {
         throw new GLException("Should not call this");
     }
 }
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
index 79d1fad62..465c8fa80 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDrawableFactory.java
@@ -91,10 +91,9 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
 
     private static final boolean isANGLE(GLDynamicLookupHelper dl) {
         if(Platform.OSType.WINDOWS == Platform.OS_TYPE) {
-            final boolean r = dl.isFunctionAvailable("eglQuerySurfacePointerANGLE") ||
-                              dl.isFunctionAvailable("glBlitFramebufferANGLE") ||
-                              dl.isFunctionAvailable("glRenderbufferStorageMultisampleANGLE");
-            return r;
+            return dl.isFunctionAvailable("eglQuerySurfacePointerANGLE") ||
+                   dl.isFunctionAvailable("glBlitFramebufferANGLE") ||
+                   dl.isFunctionAvailable("glRenderbufferStorageMultisampleANGLE");
         } else {
             return false;
         }
@@ -253,8 +252,8 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                 String key = keyI.next();
                 SharedResource sr = sharedMap.get(key);
                 System.err.println("EGLDrawableFactory.map["+i+"] "+key+" -> "+sr.getDevice()+", "+
-                                   "es1 [avail "+sr.wasES1ContextCreated+", pbuffer "+sr.hasPBufferES1+", quirks "+sr.rendererQuirksES1+", ctp "+EGLContext.getGLVersion(1, 0, sr.ctpES1, null)+"], "+
-                                   "es2 [avail "+sr.wasES2ContextCreated+", pbuffer "+sr.hasPBufferES2+", quirks "+sr.rendererQuirksES2+", ctp "+EGLContext.getGLVersion(2, 0, sr.ctpES2, null)+"]");
+                                   "es1   [avail "+sr.wasES1ContextCreated+", pbuffer "+sr.hasPBufferES1+", quirks "+sr.rendererQuirksES1+", ctp "+EGLContext.getGLVersion(1, 0, sr.ctpES1, null)+"], "+
+                                   "es2/3 [es2 "+sr.wasES2ContextCreated+", es3 "+sr.wasES3ContextCreated+", [pbuffer "+sr.hasPBufferES3ES2+", quirks "+sr.rendererQuirksES3ES2+", ctp "+EGLContext.getGLVersion(2, 0, sr.ctpES3ES2, null)+"]]");
             }
             ;
         }
@@ -271,38 +270,45 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
       private final EGLGraphicsDevice device;
       // private final EGLContext contextES1;
       // private final EGLContext contextES2;
-      private final GLRendererQuirks rendererQuirksES1;
-      private final GLRendererQuirks rendererQuirksES2;
-      private final int ctpES1;
-      private final int ctpES2;
+      // private final EGLContext contextES3;
       private final boolean wasES1ContextCreated;
       private final boolean wasES2ContextCreated;
+      private final boolean wasES3ContextCreated;
+      private final GLRendererQuirks rendererQuirksES1;
+      private final GLRendererQuirks rendererQuirksES3ES2;
+      private final int ctpES1;
+      private final int ctpES3ES2;
       private final boolean hasPBufferES1;
-      private final boolean hasPBufferES2;
+      private final boolean hasPBufferES3ES2;
 
       SharedResource(EGLGraphicsDevice dev, 
                      boolean wasContextES1Created, boolean hasPBufferES1, GLRendererQuirks rendererQuirksES1, int ctpES1,  
-                     boolean wasContextES2Created, boolean hasPBufferES2, GLRendererQuirks rendererQuirksES2, int ctpES2) {
+                     boolean wasContextES2Created, boolean wasContextES3Created, 
+                     boolean hasPBufferES3ES2, GLRendererQuirks rendererQuirksES3ES2, int ctpES3ES2) {
           this.device = dev;
           // this.contextES1 = ctxES1;
-          // this.contextES2 = ctxES2;
+          this.wasES1ContextCreated = wasContextES1Created;
+          this.hasPBufferES1= hasPBufferES1;
           this.rendererQuirksES1 = rendererQuirksES1;
-          this.rendererQuirksES2 = rendererQuirksES2;
           this.ctpES1 = ctpES1;
-          this.ctpES2 = ctpES2;
-          this.wasES1ContextCreated = wasContextES1Created;
+          
+          // this.contextES2 = ctxES2;
+          // this.contextES3 = ctxES3;
           this.wasES2ContextCreated = wasContextES2Created;
-          this.hasPBufferES1= hasPBufferES1;
-          this.hasPBufferES2= hasPBufferES2;
+          this.wasES3ContextCreated = wasContextES3Created;
+          this.hasPBufferES3ES2= hasPBufferES3ES2;
+          this.rendererQuirksES3ES2 = rendererQuirksES3ES2;
+          this.ctpES3ES2 = ctpES3ES2;
       }
       @Override
       public final boolean isValid() {
-          return wasES1ContextCreated || wasES2ContextCreated;
+          return wasES1ContextCreated || wasES2ContextCreated || wasES3ContextCreated;
       }
       @Override
       public final EGLGraphicsDevice getDevice() { return device; }
       // final EGLContext getContextES1() { return contextES1; }
       // final EGLContext getContextES2() { return contextES2; }
+      // final EGLContext getContextES3() { return contextES3; }
       
       @Override
       public AbstractGraphicsScreen getScreen() {
@@ -318,7 +324,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
       }
       @Override
       public GLRendererQuirks getRendererQuirks() {
-          return null != rendererQuirksES2 ? rendererQuirksES2 : rendererQuirksES1 ;      
+          return null != rendererQuirksES3ES2 ? rendererQuirksES3ES2 : rendererQuirksES1 ;      
       }
     }
 
@@ -353,18 +359,30 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                                             boolean[] hasPBuffer, GLRendererQuirks[] rendererQuirks, int[] ctp) {
         final String profileString;
         switch( esProfile ) {
+            case 3:
+                profileString = GLProfile.GLES3; break; 
+            case 2:
+                profileString = GLProfile.GLES2; break; 
             case 1: 
                 profileString = GLProfile.GLES1; break;
-            case 2: 
             default: 
-                profileString = GLProfile.GLES2; break; 
+                throw new GLException("Invalid ES profile number "+esProfile);
         }
         if ( !GLProfile.isAvailable(adevice, profileString) ) {
+            if( DEBUG ) {
+                System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig: "+profileString+" n/a on "+adevice);
+            }
             return false;
         }
         final GLProfile glp = GLProfile.get(adevice, profileString) ;
         final GLDrawableFactoryImpl desktopFactory = (GLDrawableFactoryImpl) GLDrawableFactory.getDesktopFactory();
         final boolean mapsADeviceToDefaultDevice = !QUERY_EGL_ES_NATIVE_TK || null == desktopFactory || adevice instanceof EGLGraphicsDevice ;
+        if( DEBUG ) {
+            System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig: "+profileString+" ( "+esProfile+" ), "+
+                               "defaultSharedResourceSet "+(null!=defaultSharedResource)+", mapsADeviceToDefaultDevice "+mapsADeviceToDefaultDevice+
+                               " (QUERY_EGL_ES_NATIVE_TK "+QUERY_EGL_ES_NATIVE_TK+", hasDesktopFactory "+(null != desktopFactory)+
+                               ", isEGLGraphicsDevice "+(adevice instanceof EGLGraphicsDevice)+")");
+        }
 
         EGLGraphicsDevice eglDevice = null;
         NativeSurface surface = null;
@@ -387,16 +405,29 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                 if( adevice != defaultDevice ) {
                     if(null == defaultSharedResource) {
                         return false;
-                    }
+                    }                    
                     switch(esProfile) {
+                        case 3:
+                            if( !defaultSharedResource.wasES3ContextCreated ) {
+                                return false;
+                            }
+                            rendererQuirks[0] = defaultSharedResource.rendererQuirksES3ES2;
+                            ctp[0] = defaultSharedResource.ctpES3ES2;
+                            break;
+                        case 2: 
+                            if( !defaultSharedResource.wasES2ContextCreated ) {
+                                return false;
+                            }
+                            rendererQuirks[0] = defaultSharedResource.rendererQuirksES3ES2;
+                            ctp[0] = defaultSharedResource.ctpES3ES2;
+                            break;
                         case 1: 
+                            if( !defaultSharedResource.wasES1ContextCreated ) {
+                                return false;
+                            }
                             rendererQuirks[0] = defaultSharedResource.rendererQuirksES1;
                             ctp[0] = defaultSharedResource.ctpES1;
                             break;
-                        case 2: 
-                            rendererQuirks[0] = defaultSharedResource.rendererQuirksES2;
-                            ctp[0] = defaultSharedResource.ctpES2;
-                            break;
                     }
                     EGLContext.mapStaticGLVersion(adevice, esProfile, 0, ctp[0]);
                     return true;
@@ -421,7 +452,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                         success = true;
                     }
                     if(DEBUG) {
-                        System.err.println("EGLDrawableFactory.isEGLContextAvailable() no pbuffer config available, detected !pbuffer config: "+success);
+                        System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig() no pbuffer config available, detected !pbuffer config: "+success);
                         EGLGraphicsConfigurationFactory.printCaps("!PBufferCaps", capsAnyL, System.err);
                     }                    
                 }                
@@ -457,13 +488,13 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
                             } else {
                                 // Oops .. something is wrong
                                 if(DEBUG) {
-                                    System.err.println("EGLDrawableFactory.isEGLContextAvailable: "+eglDevice+", "+context.getGLVersion()+" - VERSION is null, dropping availability!");                                
+                                    System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig: "+eglDevice+", "+context.getGLVersion()+" - VERSION is null, dropping availability!");                                
                                 }
                             }
                         }
                     } catch (GLException gle) {
                         if (DEBUG) {
-                            System.err.println("EGLDrawableFactory.createShared: INFO: context create/makeCurrent failed");
+                            System.err.println("EGLDrawableFactory.mapAvailableEGLESConfig: INFO: context create/makeCurrent failed");
                             gle.printStackTrace();
                         }
                     } finally {
@@ -557,14 +588,15 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
     private SharedResource createEGLSharedResourceImpl(AbstractGraphicsDevice adevice) {
         final boolean madeCurrentES1;            
         final boolean madeCurrentES2;
+        final boolean madeCurrentES3;
         boolean[] hasPBufferES1 = new boolean[] { false };
-        boolean[] hasPBufferES2 = new boolean[] { false };
+        boolean[] hasPBufferES3ES2 = new boolean[] { false };
         // EGLContext[] eglCtxES1 = new EGLContext[] { null };
         // EGLContext[] eglCtxES2 = new EGLContext[] { null };
         GLRendererQuirks[] rendererQuirksES1 = new GLRendererQuirks[] { null };
-        GLRendererQuirks[] rendererQuirksES2 = new GLRendererQuirks[] { null };
+        GLRendererQuirks[] rendererQuirksES3ES2 = new GLRendererQuirks[] { null };
         int[] ctpES1 = new int[] { -1 };
-        int[] ctpES2 = new int[] { -1 };
+        int[] ctpES3ES2 = new int[] { -1 };
         
         
         if (DEBUG) {
@@ -577,9 +609,16 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
             madeCurrentES1 = false;
         }
         if( null != eglES2DynamicLookupHelper ) {
-            madeCurrentES2 = mapAvailableEGLESConfig(adevice, 2, hasPBufferES2, rendererQuirksES2, ctpES2);
+            madeCurrentES3 = mapAvailableEGLESConfig(adevice, 3, hasPBufferES3ES2, rendererQuirksES3ES2, ctpES3ES2);
+            if( madeCurrentES3 ) {
+                madeCurrentES2 = true;
+                EGLContext.mapStaticGLVersion(adevice, 2, 0, ctpES3ES2[0]);
+            } else {
+                madeCurrentES2 = mapAvailableEGLESConfig(adevice, 2, hasPBufferES3ES2, rendererQuirksES3ES2, ctpES3ES2);
+            }
         } else {
             madeCurrentES2 = false;
+            madeCurrentES3 = false;
         }
         
         if( !EGLContext.getAvailableGLVersionsSet(adevice) ) {
@@ -589,10 +628,10 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
         }
         if( hasX11 ) {
             handleDontCloseX11DisplayQuirk(rendererQuirksES1[0]);
-            handleDontCloseX11DisplayQuirk(rendererQuirksES2[0]);
+            handleDontCloseX11DisplayQuirk(rendererQuirksES3ES2[0]);
         }
         final SharedResource sr = new SharedResource(defaultDevice, madeCurrentES1, hasPBufferES1[0], rendererQuirksES1[0], ctpES1[0],
-                                                                    madeCurrentES2, hasPBufferES2[0], rendererQuirksES2[0], ctpES2[0]);
+                                                                    madeCurrentES2, madeCurrentES3, hasPBufferES3ES2[0], rendererQuirksES3ES2[0], ctpES3ES2[0]);
         
         synchronized(sharedMap) {
             sharedMap.put(adevice.getUniqueID(), sr);
@@ -600,7 +639,8 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
         if (DEBUG) {
             System.err.println("EGLDrawableFactory.createShared: devices: queried nativeTK "+QUERY_EGL_ES_NATIVE_TK+", adevice " + adevice + ", defaultDevice " + defaultDevice);
             System.err.println("EGLDrawableFactory.createShared: context ES1: " + madeCurrentES1 + ", hasPBuffer "+hasPBufferES1[0]);
-            System.err.println("EGLDrawableFactory.createShared: context ES2: " + madeCurrentES2 + ", hasPBuffer "+hasPBufferES2[0]);
+            System.err.println("EGLDrawableFactory.createShared: context ES2: " + madeCurrentES2 + ", hasPBuffer "+hasPBufferES3ES2[0]);
+            System.err.println("EGLDrawableFactory.createShared: context ES3: " + madeCurrentES3 + ", hasPBuffer "+hasPBufferES3ES2[0]);
             dumpMap();
         }
         return sr;
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
index 9f4a4d2c2..778f0cb38 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
@@ -39,7 +39,7 @@ import jogamp.opengl.*;
  * Abstract implementation of the DynamicLookupHelper for EGL,
  * which decouples it's dependencies to EGLDrawable.
  *
- * Currently two implementations exist, one for ES1 and one for ES2.
+ * Currently two implementations exist, one for ES1 and one for ES3 and ES2.
  */
 public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundleInfo {
     static final List<String> glueLibNames;
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
index d83acdb6b..0d20fd4e8 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
@@ -30,6 +30,11 @@ package jogamp.opengl.egl;
 
 import java.util.*;
 
+/** 
+ * <p>
+ * Covering ES3 and ES2.
+ * </p>
+ */
 public final class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo {
     protected EGLES2DynamicLibraryBundleInfo() {
         super();
@@ -40,18 +45,33 @@ public final class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundl
         {
             final List<String> libsGL = new ArrayList<String>();
             
-            // this is the default lib name, according to the spec 
+            // ES3: This is the default lib name, according to the spec            
+            libsGL.add("libGLESv3.so.3");
+            
+            // ES3: Try these as well, if spec fails
+            libsGL.add("libGLESv3.so");            
+            libsGL.add("GLESv3");
+
+            // ES3: Alternative names
+            libsGL.add("GLES30");
+
+            // ES3: For windows distributions using the 'unlike' lib prefix
+            // where our tool does not add it.
+            libsGL.add("libGLESv3");
+            libsGL.add("libGLES30");
+            
+            // ES2: This is the default lib name, according to the spec            
             libsGL.add("libGLESv2.so.2");
             
-            // try these as well, if spec fails
+            // ES2: Try these as well, if spec fails
             libsGL.add("libGLESv2.so");            
             libsGL.add("GLESv2");
 
-            // alternative names
+            // ES2: Alternative names
             libsGL.add("GLES20");
             libsGL.add("GLESv2_CM");
 
-            // for windows distributions using the 'unlike' lib prefix
+            // ES2: For windows distributions using the 'unlike' lib prefix
             // where our tool does not add it.
             libsGL.add("libGLESv2");
             libsGL.add("libGLESv2_CM");
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java
index f857c6b5c..b61624d79 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLGLCapabilities.java
@@ -101,12 +101,16 @@ public class EGLGLCapabilities extends GLCapabilities {
     if(null == glp) {
         return true;
     }
-    if(0 != (renderableType & EGL.EGL_OPENGL_ES_BIT) && glp.usesNativeGLES1()) {
+    /** FIXME: EGLExt.EGL_OPENGL_ES3_BIT_KHR OK ? */
+    if(0 != (renderableType & EGLExt.EGL_OPENGL_ES3_BIT_KHR) && glp.usesNativeGLES3()) {
         return true;
     }
     if(0 != (renderableType & EGL.EGL_OPENGL_ES2_BIT) && glp.usesNativeGLES2()) {
         return true;
     }
+    if(0 != (renderableType & EGL.EGL_OPENGL_ES_BIT) && glp.usesNativeGLES1()) {
+        return true;
+    }
     if(0 != (renderableType & EGL.EGL_OPENGL_BIT) && !glp.usesNativeGLES()) {
         return true;
     }