OpenGL ES/EGL Overhaul

- GLProfile properly detects native EGL/ES1/ES2 on the 'desktop' device factory.
  This allows usage of Mesa's EGL/ES or Imageon's PVR emulation, etc.

- GLProfile drops getDefaultDesktopDevice() and getDefaultEGLDevice()
  since both are aligned by getDefaultDevice().

- Fix GL_ARB_ES2_compatibility detection and utilize
  resulting isGLES2Compatible() where possible.
  This allows ES2 compatible desktop profiles to use core ES2 functionality
  (glShaderBinary() .. etc) even with a GL2ES2 desktop implementation.

- EGLDrawable: If createSurface(..) fails (BAD_NATIVE_WINDOW) w/ surfaceHandle
  it uses windowHandle if available and differs.
  This allows the ANGLE impl. to work.

- Properly order of EGL/ES library lookup:
  ES2: libGLESv2.so.2, libGLESv2.so, GLES20, GLESv2_CM
  EGL: libEGL.so.1, libEGL.so, EGL

- *DynamicLookupHelper reference will be null if it's library is not complete
   (all tool libs, all glue libs and a ProcAddressFunc lookup function - if named).

- Enhance GL version string (incl. ES2 compatible, hw/sw, ..)

- GLBase: Fix docs and remove redundancies

- Prepared (disabled) DesktopES2DynamicLibraryBundleInfo
  to be used for a real EGL/ES2 implementation within the desktop GL lib (AMD).
  Sadly it currenly crashed within eglGetDisplay(EGL_DEFAULT_DISPLAY),
  hence it's disabled.

6 files changed, 265 insertions, 206 deletions

diff --git a/src/jogl/classes/javax/media/opengl/GLBase.java b/src/jogl/classes/javax/media/opengl/GLBase.java
index 899503ea6..bd24b15bc 100644
--- a/src/jogl/classes/javax/media/opengl/GLBase.java
+++ b/src/jogl/classes/javax/media/opengl/GLBase.java
@@ -81,86 +81,80 @@ package javax.media.opengl;
 public interface GLBase {
     
   /**
-   * Indicates whether this GL object conforms to any of the common GL profiles.
-   * @return whether this GL object conforms to any of the common GL profiles
+   * Indicates whether this GL object conforms to any of the OpenGL profiles.
    */
   public boolean isGL();
 
   /**
-   * Indicates whether this GL object conforms to the GL4 compatibility profile.
-   * The GL4 compatibility profile merges the GL2 profile and GL4 core profile.
-   * @return whether this GL object conforms to the GL4 compatibility profile
+   * Indicates whether this GL object conforms to the OpenGL ≥ 4.0 compatibility profile.
+   * The GL4 compatibility profile includes the GL2, GL2ES1, GL2ES2, GL3, GL3bc and GL4 profile.
    */
   public boolean isGL4bc();
 
   /**
-   * Indicates whether this GL object conforms to the GL4 core profile.
-   * The GL4 core profile reflects OpenGL versions greater or equal 3.1
-   * @return whether this GL object conforms to the GL4 core profile
+   * Indicates whether this GL object conforms to the OpenGL ≥ 4.0 core profile.
+   * The GL4 core profile includes the GL2ES2, and GL3 profile.
    */
   public boolean isGL4();
 
   /**
-   * Indicates whether this GL object conforms to the GL3 compatibility profile.
-   * The GL3 compatibility profile merges the GL2 profile and GL3 core profile.
-   * @return whether this GL object conforms to the GL3 compatibility profile
+   * Indicates whether this GL object conforms to the OpenGL ≥ 3.1 compatibility profile.
+   * The GL3 compatibility profile includes the GL2, GL2ES1, GL2ES2 and GL3 profile.
    */
   public boolean isGL3bc();
 
   /**
-   * Indicates whether this GL object conforms to the GL3 core profile.
-   * The GL3 core profile reflects OpenGL versions greater or equal 3.1
-   * @return whether this GL object conforms to the GL3 core profile
+   * Indicates whether this GL object conforms to the OpenGL ≥ 3.1 core profile.
+   * The GL3 core profile includes the GL2ES2 profile.
    */
   public boolean isGL3();
 
   /**
-   * Indicates whether this GL object conforms to the GL2 profile.
-   * The GL2 profile reflects OpenGL versions greater or equal 1.5
-   * @return whether this GL object conforms to the GL2 profile
+   * Indicates whether this GL object conforms to the OpenGL ≤ 3.0 profile.
+   * The GL2 profile includes the GL2ES1 and GL2ES2 profile.
    */
   public boolean isGL2();
 
   /**
-   * Indicates whether this GL object conforms to the GLES1 profile.
-   * @return whether this GL object conforms to the GLES1 profile
+   * Indicates whether this GL object conforms to the OpenGL ES1 ≥ 1.0 profile.
    */
   public boolean isGLES1();
 
   /**
-   * Indicates whether this GL object conforms to the GLES2 profile.
-   * @return whether this GL object conforms to the GLES2 profile
+   * Indicates whether this GL object conforms to the OpenGL ES2 ≥ 2.0 profile.
+   * <p>
+   * Remark: ES2 compatible desktop profiles are not included.
+   * To query whether core ES2 functionality is provided, use {@link #isGLES2Compatible()}.
+   * </p> 
+   * @see #isGLES2Compatible()
    */
   public boolean isGLES2();
 
   /**
-   * Indicates whether this GL object conforms to one of the OpenGL ES compatible profiles.
-   * @return whether this GL object conforms to one of the OpenGL ES profiles
+   * Indicates whether this GL object conforms to one of the OpenGL ES profiles,
+   * see {@link #isGLES1()} and {@link #isGLES2()}.
    */
   public boolean isGLES();
 
   /**
-   * Indicates whether this GL object conforms to the GL2ES1 compatible profile.
-   * @return whether this GL object conforms to the GL2ES1 profile
+   * Indicates whether this GL object conforms to a GL2ES1 compatible profile.
    */
   public boolean isGL2ES1();
 
   /**
-   * Indicates whether this GL object conforms to the GL2ES2 compatible profile.
-   * @return whether this GL object conforms to the GL2ES2 profile
+   * Indicates whether this GL object conforms to a GL2ES2 compatible profile.
    */
   public boolean isGL2ES2();
 
   /**
-   * Indicates whether this GL object is compatible with OpenGL ES2.
+   * Indicates whether this GL object is compatible with the core OpenGL ES2 functionality.
    * @return true if this context is an ES2 context or implements 
    *         the extension <code>GL_ARB_ES2_compatibility</code>, otherwise false 
    */
   public boolean isGLES2Compatible();
 
   /**
-   * Indicates whether this GL object conforms to the GL2GL3 compatible profile.
-   * @return whether this GL object conforms to the GL2GL3 profile
+   * Indicates whether this GL object conforms to a GL2GL3 compatible profile.
    */
   public boolean isGL2GL3();
 
@@ -169,90 +163,77 @@ public interface GLBase {
 
   /**
    * Casts this object to the GL interface.
-   * @return this object cast to the GL interface
    * @throws GLException if this GLObject is not a GL implementation
    */
   public GL getGL() throws GLException;
 
   /**
    * Casts this object to the GL4bc interface.
-   * @return this object cast to the GL4bc interface
    * @throws GLException if this GLObject is not a GL4bc implementation
    */
   public GL4bc getGL4bc() throws GLException;
 
   /**
    * Casts this object to the GL4 interface.
-   * @return this object cast to the GL4 interface
    * @throws GLException if this GLObject is not a GL4 implementation
    */
   public GL4 getGL4() throws GLException;
 
   /**
    * Casts this object to the GL3bc interface.
-   * @return this object cast to the GL3bc interface
    * @throws GLException if this GLObject is not a GL3bc implementation
    */
   public GL3bc getGL3bc() throws GLException;
 
   /**
    * Casts this object to the GL3 interface.
-   * @return this object cast to the GL3 interface
    * @throws GLException if this GLObject is not a GL3 implementation
    */
   public GL3 getGL3() throws GLException;
 
   /**
    * Casts this object to the GL2 interface.
-   * @return this object cast to the GL2 interface
    * @throws GLException if this GLObject is not a GL2 implementation
    */
   public GL2 getGL2() throws GLException;
 
   /**
    * Casts this object to the GLES1 interface.
-   * @return this object cast to the GLES1 interface
    * @throws GLException if this GLObject is not a GLES1 implementation
    */
   public GLES1 getGLES1() throws GLException;
 
   /**
    * Casts this object to the GLES2 interface.
-   * @return this object cast to the GLES2 interface
    * @throws GLException if this GLObject is not a GLES2 implementation
    */
   public GLES2 getGLES2() throws GLException;
 
   /**
    * Casts this object to the GL2ES1 interface.
-   * @return this object cast to the GL2ES1 interface
    * @throws GLException if this GLObject is not a GL2ES1 implementation
    */
   public GL2ES1 getGL2ES1() throws GLException;
 
   /**
    * Casts this object to the GL2ES2 interface.
-   * @return this object cast to the GL2ES2 interface
    * @throws GLException if this GLObject is not a GL2ES2 implementation
    */
   public GL2ES2 getGL2ES2() throws GLException;
 
   /**
    * Casts this object to the GL2GL3 interface.
-   * @return this object cast to the GL2GL3 interface
    * @throws GLException if this GLObject is not a GL2GL3 implementation
    */
   public GL2GL3 getGL2GL3() throws GLException;
 
   /**
-   * Returns the GLProfile with which this GL object is associated.
-   * @return the GLProfile with which this GL object is associated
+   * Returns the GLProfile associated with this GL object.
    */
   public GLProfile getGLProfile();
 
   /**
-   * Returns the GLContext with which this GL object is associated.
-   * @return the GLContext with which this GL object is associated
+   * Returns the GLContext associated which this GL object.
    */
   public GLContext getContext();
 
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 131f42e06..0cf92fb14 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -91,26 +91,26 @@ public abstract class GLContext {
   public static final int CONTEXT_CURRENT_NEW = 2;
 
   /** <code>ARB_create_context</code> related: created via ARB_create_context */
-  protected static final int CTX_IS_ARB_CREATED = 1 << 0;
+  protected static final int CTX_IS_ARB_CREATED  = 1 <<  0;
   /** <code>ARB_create_context</code> related: compatibility profile */
-  protected static final int CTX_PROFILE_COMPAT = 1 << 1;
+  protected static final int CTX_PROFILE_COMPAT  = 1 <<  1;
   /** <code>ARB_create_context</code> related: core profile */
-  protected static final int CTX_PROFILE_CORE   = 1 << 2;
+  protected static final int CTX_PROFILE_CORE    = 1 <<  2;
   /** <code>ARB_create_context</code> related: ES profile */
-  protected static final int CTX_PROFILE_ES     = 1 << 3;
+  protected static final int CTX_PROFILE_ES      = 1 <<  3;
   /** <code>ARB_create_context</code> related: flag forward compatible */
-  protected static final int CTX_OPTION_FORWARD = 1 << 4;
+  protected static final int CTX_OPTION_FORWARD  = 1 <<  4;
   /** <code>ARB_create_context</code> related: flag not forward compatible */
-  protected static final int CTX_OPTION_ANY     = 1 << 5;
+  protected static final int CTX_OPTION_ANY      = 1 <<  5;
   /** <code>ARB_create_context</code> related: flag debug */
-  public static final int CTX_OPTION_DEBUG   = 1 << 6;  
-  /** <code>GL_ARB_ES2_compatibility</code> related: Context is compatible w/ ES2 */
-  protected static final int CTX_PROFILE_ES2_COMPAT = 1 << 8;
-
-  /** GLContext {@link com.jogamp.gluegen.runtime.ProcAddressTable} caching related: GL software implementation */
-  protected static final int CTX_IMPL_ACCEL_SOFT = 1 << 0;
-  /** GLContext {@link com.jogamp.gluegen.runtime.ProcAddressTable} caching related: GL hardware implementation */
-  protected static final int CTX_IMPL_ACCEL_HARD = 1 << 1;
+  public static final int CTX_OPTION_DEBUG       = 1 <<  6;  
+  /** <code>GL_ARB_ES2_compatibility</code> implementation related: Context is compatible w/ ES2 */
+  protected static final int CTX_IMPL_ES2_COMPAT = 1 <<  8;
+
+  /** Implementation / GLContext {@link com.jogamp.gluegen.runtime.ProcAddressTable} caching related: GL software implementation */
+  protected static final int CTX_IMPL_ACCEL_SOFT = 1 << 14;
+  /** Implementation / GLContext {@link com.jogamp.gluegen.runtime.ProcAddressTable} caching related: GL hardware implementation */
+  protected static final int CTX_IMPL_ACCEL_HARD = 1 << 15;
   
   private static ThreadLocal<GLContext> currentContext = new ThreadLocal<GLContext>();
 
@@ -471,13 +471,17 @@ public abstract class GLContext {
    * <ul>
    *   <li> options
    *   <ul>
+   *     <li> <code>ES profile</code> ES profile</li>
+   *     <li> <code>Compatibility profile</code>Compatibility profile including fixed function pipeline and deprecated functionality</li>
+   *     <li> <code>Core profile</code>Core profile</li>
+   *     <li> <code>forward</code>Forward profile excluding deprecated functionality</li>
+   *     <li> <code>any</code> refers to the non forward compatible context</li>
    *     <li> <code>old</code> refers to the non ARB_create_context created context</li>
    *     <li> <code>new</code> refers to the ARB_create_context created context</li>
-   *     <li> <code>compatible profile</code></li>
-   *     <li> <code>core profile</code></li>
-   *     <li> <code>forward compatible</code></li>
-   *     <li> <code>any</code> refers to the non forward compatible context</li>
-   *     <li> <code>ES</code>  refers to the GLES context variant</li>
+   *     <li> <code>debug</code> refers to a debug context</li>
+   *     <li> <code>ES2 compatible</code> refers to an ES2 compatible implementation</li>
+   *     <li> <code>software</code> refers to a software implementation of the rasterizer</li>
+   *     <li> <code>hardware</code> refers to a hardware implementation of the rasterizer</li>
    *   </ul></li>
    *   <li> <i>gl-version</i> the GL_VERSION string</li>
    * </ul>
@@ -492,13 +496,14 @@ public abstract class GLContext {
    * </table> 
    *
    * <table border="0">
-   *     <tr><td></td>   <td>ES2</td>  <td><code>2.0 (ES, any, new) - 2.0 ES Profile</code></td></tr>
-   *     <tr><td>ATI</td><td>GL2</td>  <td><code>3.0 (compatibility profile, any, new) - 3.2.9704 Compatibility Profile Context</code></td></tr>
-   *     <tr><td>ATI</td><td>GL3</td>  <td><code>3.3 (core profile, any, new) - 1.4 (3.2.9704 Compatibility Profile Context)</code></td></tr>
-   *     <tr><td>ATI</td><td>GL3bc</td><td><code>3.3 (compatibility profile, any, new) - 1.4 (3.2.9704 Compatibility Profile Context)</code></td></tr>
-   *     <tr><td>NV</td><td>GL2</td>   <td><code>3.0 (compatibility profile, any, new) - 3.0.0 NVIDIA 195.36.07.03</code></td></tr>
-   *     <tr><td>NV</td><td>GL3</td>   <td><code>3.3 (core profile, any, new) - 3.3.0 NVIDIA 195.36.07.03</code></td></tr>
-   *     <tr><td>NV</td><td>GL3bc</td> <td><code>3.3 (compatibility profile, any, new) - 3.3.0 NVIDIA 195.36.07.03</code></td></tr>
+   *     <tr><td></td>   <td>ES2</td>  <td><code>2.0 (ES profile, any, new, ES2 compatible, hardware) - 2.0 ES Profile</code></td></tr>
+   *     <tr><td>ATI</td><td>GL2</td>  <td><code>3.0 (Compatibility profile, any, new, hardware) - 3.2.9704 Compatibility Profile Context</code></td></tr>
+   *     <tr><td>ATI</td><td>GL3</td>  <td><code>3.3 (Core profile, any, new, hardware) - 1.4 (3.2.9704 Compatibility Profile Context)</code></td></tr>
+   *     <tr><td>ATI</td><td>GL3bc</td><td><code>3.3 (Compatibility profile, any, new, hardware) - 1.4 (3.2.9704 Compatibility Profile Context)</code></td></tr>
+   *     <tr><td>NV</td><td>GL2</td>   <td><code>3.0 (Compatibility profile, any, new, hardware) - 3.0.0 NVIDIA 195.36.07.03</code></td></tr>
+   *     <tr><td>NV</td><td>GL3</td>   <td><code>3.3 (Core profile, any, new, hardware) - 3.3.0 NVIDIA 195.36.07.03</code></td></tr>
+   *     <tr><td>NV</td><td>GL3bc</td> <td><code>3.3 (Compatibility profile, any, new, hardware) - 3.3.0 NVIDIA 195.36.07.03</code></td></tr>
+   *     <tr><td>NV</td><td>GL2</td>   <td><code>3.0 (Compatibility profile, any, new, ES2 compatible, hardware) - 3.0.0 NVIDIA 290.10</code></td></tr>
    * </table> 
    */
   public final String getGLVersion() {
@@ -560,7 +565,7 @@ public abstract class GLContext {
    *         the extension <code>GL_ARB_ES2_compatibility</code>, otherwise false 
    */
   public final boolean isGLES2Compatible() {
-      return 0 != ( ctxOptions & CTX_PROFILE_ES2_COMPAT ) ;
+      return 0 != ( ctxOptions & CTX_IMPL_ES2_COMPAT ) ;
   }
   
   public final boolean hasGLSL() {
@@ -742,29 +747,10 @@ public abstract class GLContext {
       return true;
   }
 
-  protected static int compose8bit(int one, int two, int three, int four) {
-    return  ( ( one   & 0x000000FF ) << 24 ) |
-            ( ( two   & 0x000000FF ) << 16 ) |
-            ( ( three & 0x000000FF ) <<  8 ) |
-            ( ( four  & 0x000000FF )       ) ;
-  }
-
-  protected static int getComposed8bit(int bits32, int which ) {
-    switch (which) {
-        case 1: return ( bits32 & 0xFF000000 ) >> 24 ;
-        case 2: return ( bits32 & 0x00FF0000 ) >> 16 ;
-        case 3: return ( bits32 & 0x0000FF00 ) >>  8 ;
-        case 4: return ( bits32 & 0xFF0000FF )       ;
-    }
-    throw new GLException("argument which out of range: "+which);
-  }
-
-  protected static String composed8BitToString(int bits32, boolean hex1, boolean hex2, boolean hex3, boolean hex4) {
-    int a = getComposed8bit(bits32, 1);
-    int b = getComposed8bit(bits32, 2);
-    int c = getComposed8bit(bits32, 3);
-    int d = getComposed8bit(bits32, 4);
-    return "["+toString(a, hex1)+", "+toString(b, hex2)+", "+toString(c, hex3)+", "+toString(d, hex4)+"]";
+  protected static int composeBits(int a8, int b8, int c16) {
+    return  ( ( a8    & 0x000000FF ) << 24 ) |
+            ( ( b8    & 0x000000FF ) << 16 ) |
+            ( ( c16   & 0x0000FFFF )       ) ;
   }
 
   private static void validateProfileBits(int bits, String argName) {
@@ -792,7 +778,7 @@ public abstract class GLContext {
   private static /*final*/ HashSet<String> deviceVersionsAvailableSet = new HashSet<String>();
 
   protected static String getDeviceVersionAvailableKey(AbstractGraphicsDevice device, int major, int profile) {
-      return device.getUniqueID() + "-" + toHexString(compose8bit(major, profile, 0, 0));
+      return device.getUniqueID() + "-" + toHexString(composeBits(major, profile, 0));
   }
 
   protected static boolean getAvailableGLVersionsSet(AbstractGraphicsDevice device) {
@@ -841,7 +827,7 @@ public abstract class GLContext {
     validateProfileBits(resCtp, "resCtp");
 
     String key = getDeviceVersionAvailableKey(device, reqMajor, profile);
-    Integer val = new Integer(compose8bit(resMajor, resMinor, resCtp, 0));
+    Integer val = new Integer(composeBits(resMajor, resMinor, resCtp));
     synchronized(deviceVersionAvailable) {
         val = deviceVersionAvailable.put( key, val );
     }
@@ -872,20 +858,57 @@ public abstract class GLContext {
         return false;
     }
 
-    int val = valI.intValue();
+    int bits32 = valI.intValue();
 
     if(null!=major) {
-        major[0] = getComposed8bit(val, 1);
+        major[0] = ( bits32 & 0xFF000000 ) >> 24 ;
     }
     if(null!=minor) {
-        minor[0] = getComposed8bit(val, 2);
+        minor[0] = ( bits32 & 0x00FF0000 ) >> 16 ;
     }
     if(null!=ctp) {
-        ctp[0]   = getComposed8bit(val, 3);
+        ctp[0]   = ( bits32 & 0x0000FFFF )       ;
     }
     return true;
   }
 
+  /** 
+   * returns the highest GLProfile string regarding the implementation version and context profile bits.
+   * @throws GLException if version and context profile bits could not be mapped to a GLProfile
+   */
+  protected static String getGLProfile(int major, int minor, int ctp) 
+          throws GLException {
+    if(0 != ( CTX_PROFILE_COMPAT & ctp )) {        
+        if(major >= 4)                            { return GLProfile.GL4bc; }
+        else if(major == 3 && minor >= 1)         { return GLProfile.GL3bc; }
+        else                                      { return GLProfile.GL2; }        
+    } else if(0 != ( CTX_PROFILE_CORE & ctp )) {
+        if(major >= 4)                            { return GLProfile.GL4; }
+        else if(major == 3 && minor >= 1)         { return GLProfile.GL3; }        
+    } else if(0 != ( CTX_PROFILE_ES & ctp )) {
+        if(major == 2)                            { return GLProfile.GLES2; }
+        else if(major == 1)                       { return GLProfile.GLES1; }                
+    }
+    throw new GLException("Unhandled OpenGL version/profile: "+GLContext.getGLVersion(major, minor, ctp, null));
+  }
+  
+  /** 
+   * @param major Key Value either 1, 2, 3 or 4
+   * @param profile Key Value either {@link #CTX_PROFILE_COMPAT}, {@link #CTX_PROFILE_CORE} or {@link #CTX_PROFILE_ES}
+   * @return the highest GLProfile string regarding the version and profile bits.
+   * @throws GLException if version and context profile bits could not be mapped to a GLProfile
+   */  
+  public static String getAvailableGLProfile(AbstractGraphicsDevice device, int reqMajor, int reqProfile) 
+          throws GLException {
+    int major[] = { 0 };
+    int minor[] = { 0 };
+    int ctp[] = { 0 };
+    if(GLContext.getAvailableGLVersion(device, reqMajor, reqProfile, major, minor, ctp)) {
+        return GLContext.getGLProfile(major[0], minor[0], ctp[0]);
+    }
+    return null;
+  }
+
   /**
    * @param major Key Value either 1, 2, 3 or 4
    * @param profile Key Value either {@link #CTX_PROFILE_COMPAT}, {@link #CTX_PROFILE_CORE} or {@link #CTX_PROFILE_ES}
@@ -943,15 +966,17 @@ public abstract class GLContext {
     sb.append(".");
     sb.append(minor);
     sb.append(" (");
-    needColon = appendString(sb, "ES",                    needColon, 0 != ( CTX_PROFILE_ES & ctp ));
-    needColon = appendString(sb, "ES2 compatible",        needColon, 0 != ( CTX_PROFILE_ES2_COMPAT & ctp ));
-    needColon = appendString(sb, "compatibility profile", needColon, 0 != ( CTX_PROFILE_COMPAT & ctp ));
-    needColon = appendString(sb, "core profile",          needColon, 0 != ( CTX_PROFILE_CORE & ctp ));
-    needColon = appendString(sb, "forward compatible",    needColon, 0 != ( CTX_OPTION_FORWARD & ctp ));
-    needColon = appendString(sb, "debug",                 needColon, 0 != ( CTX_OPTION_DEBUG & ctp ));    
+    needColon = appendString(sb, "ES profile",            needColon, 0 != ( CTX_PROFILE_ES & ctp ));
+    needColon = appendString(sb, "Compatibility profile", needColon, 0 != ( CTX_PROFILE_COMPAT & ctp ));
+    needColon = appendString(sb, "Core profile",          needColon, 0 != ( CTX_PROFILE_CORE & ctp ));
+    needColon = appendString(sb, "forward",               needColon, 0 != ( CTX_OPTION_FORWARD & ctp ));
     needColon = appendString(sb, "any",                   needColon, 0 != ( CTX_OPTION_ANY & ctp ));
     needColon = appendString(sb, "new",                   needColon, 0 != ( CTX_IS_ARB_CREATED & ctp ));
     needColon = appendString(sb, "old",                   needColon, 0 == ( CTX_IS_ARB_CREATED & ctp ));
+    needColon = appendString(sb, "debug",                 needColon, 0 != ( CTX_OPTION_DEBUG & ctp ));    
+    needColon = appendString(sb, "ES2 compatible",        needColon, 0 != ( CTX_IMPL_ES2_COMPAT & ctp ));
+    needColon = appendString(sb, "software",              needColon, 0 != ( CTX_IMPL_ACCEL_SOFT & ctp ));
+    needColon = appendString(sb, "hardware",              needColon, 0 != ( CTX_IMPL_ACCEL_HARD & ctp ));
     sb.append(")");
     if(null!=gl_version) {
         sb.append(" - ");
@@ -964,13 +989,6 @@ public abstract class GLContext {
   // internal string utils 
   //
   
-  protected static String toString(int val, boolean hex) {
-    if(hex) {
-        return "0x" + Integer.toHexString(val);
-    }
-    return String.valueOf(val);
-  }
-
   protected static String toHexString(int hex) {
     return "0x" + Integer.toHexString(hex);
   }
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index 3f9700436..088ff054a 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -317,15 +317,13 @@ public abstract class GLDrawableFactory {
 
   protected static GLDrawableFactory getFactoryImpl(String glProfileImplName) throws GLException {
     if ( GLProfile.usesNativeGLES(glProfileImplName) ) {
-        if(null==eglFactory) {
-            throw new GLException("No EGLDrawableFactory available for profile: "+glProfileImplName);
+        if(null!=eglFactory) {   
+            return eglFactory;
         }
-        return eglFactory;
-    }
-    if(null==nativeOSFactory) {
-        throw new GLException("No native platform GLDrawableFactory available for profile: "+glProfileImplName);
+    } else if(null!=nativeOSFactory) {
+        return nativeOSFactory;
     }
-    return nativeOSFactory;
+    throw new GLException("No GLDrawableFactory available for profile: "+glProfileImplName);
   }
 
   protected static GLDrawableFactory getFactoryImpl(AbstractGraphicsDevice device) throws GLException {
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 6b39fe765..91dcd4e27 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -39,7 +39,6 @@ package javax.media.opengl;
 
 import jogamp.opengl.Debug;
 import jogamp.opengl.GLDrawableFactoryImpl;
-import jogamp.opengl.GLDynamicLookupHelper;
 import jogamp.opengl.DesktopGLDynamicLookupHelper;
 
 import com.jogamp.common.GlueGenVersion;
@@ -246,8 +245,25 @@ public class GLProfile {
     }
     
     public static String glAvailabilityToString(AbstractGraphicsDevice device) {
+        return glAvailabilityToString(device, null).toString();
+    }
+    
+    public static StringBuilder glAvailabilityToString(AbstractGraphicsDevice device, StringBuilder sb) {
+        return glAvailabilityToString(device, sb, null, 0);
+    }
+    private static StringBuilder doIndent(StringBuilder sb, String indent, int indentCount) {
+        while(indentCount>0) {
+            sb.append(indent);
+            indentCount--;
+        }
+        return sb;
+    }
+    public static StringBuilder glAvailabilityToString(AbstractGraphicsDevice device, StringBuilder sb, String indent, int indentCount) {
         boolean avail;
-        StringBuffer sb = new StringBuffer();
+        if(null == sb) {
+            sb = new StringBuilder();
+        }
+        final boolean useIndent = null != indent;
 
         initSingleton();
         
@@ -256,77 +272,135 @@ public class GLProfile {
         }
         final HashMap<String /*GLProfile_name*/, GLProfile> map = getProfileMap(device, false);
         
-        sb.append("GLAvailability[Native[GL4bc ");
+        if(useIndent) {
+            doIndent(sb, indent, indentCount).append("Native");
+            indentCount++;
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GL4bc").append(indent);
+        } else {
+            sb.append("Native[GL4bc ");
+        }        
         avail=isAvailableImpl(map, GL4bc);
         sb.append(avail);
         if(avail) {
-            glAvailabilityToString(device, sb, 4, GLContext.CTX_PROFILE_COMPAT);
+            glAvailabilityToString(device, sb.append(" "), 4, GLContext.CTX_PROFILE_COMPAT);
         }
 
-        sb.append(", GL4 ");
+        if(useIndent) {
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GL4").append(indent);
+        } else {
+            sb.append(", GL4 ");
+        }
         avail=isAvailableImpl(map, GL4);
         sb.append(avail);
         if(avail) {
-            glAvailabilityToString(device, sb, 4, GLContext.CTX_PROFILE_CORE);
+            glAvailabilityToString(device, sb.append(" "), 4, GLContext.CTX_PROFILE_CORE);
         }
 
-        sb.append(", GL3bc ");
+        if(useIndent) {
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GL3bc").append(indent);
+        } else {
+            sb.append(", GL3bc ");
+        }
         avail=isAvailableImpl(map, GL3bc);
         sb.append(avail);
         if(avail) {
-            glAvailabilityToString(device, sb, 3, GLContext.CTX_PROFILE_COMPAT);
+            glAvailabilityToString(device, sb.append(" "), 3, GLContext.CTX_PROFILE_COMPAT);
         }
 
-        sb.append(", GL3 ");
+        if(useIndent) {
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GL3").append(indent);
+        } else {
+            sb.append(", GL3 ");
+        }
         avail=isAvailableImpl(map, GL3);
         sb.append(avail);
         if(avail) {
-            glAvailabilityToString(device, sb, 3, GLContext.CTX_PROFILE_CORE);
+            glAvailabilityToString(device, sb.append(" "), 3, GLContext.CTX_PROFILE_CORE);
         }
 
-        sb.append(", GL2 ");
+        if(useIndent) {
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GL2").append(indent);
+        } else {
+            sb.append(", GL2 ");
+        }
         avail=isAvailableImpl(map, GL2);
         sb.append(avail);
         if(avail) {
-            glAvailabilityToString(device, sb, 2, GLContext.CTX_PROFILE_COMPAT);
+            glAvailabilityToString(device, sb.append(" "), 2, GLContext.CTX_PROFILE_COMPAT);
         }
 
-        sb.append(", GL2ES1 ");
+        if(useIndent) {
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GL2ES1").append(indent);
+        } else {
+            sb.append(", GL2ES1 ");
+        }
         sb.append(isAvailableImpl(map, GL2ES1));
 
-        sb.append(", GLES1 ");
+        if(useIndent) {
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GLES1").append(indent);
+        } else {
+            sb.append(", GLES1 ");
+        }
         avail=isAvailableImpl(map, GLES1);
         sb.append(avail);
         if(avail) {
-            glAvailabilityToString(device, sb, 1, GLContext.CTX_PROFILE_ES);
+            glAvailabilityToString(device, sb.append(" "), 1, GLContext.CTX_PROFILE_ES);
         }
 
-        sb.append(", GL2ES2 ");
+        if(useIndent) {
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GL2ES2").append(indent);
+        } else {
+            sb.append(", GL2ES2 ");
+        }
         sb.append(isAvailableImpl(map, GL2ES2));
 
-        sb.append(", GLES2 ");
+        if(useIndent) {
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("GLES2").append(indent);
+        } else {
+            sb.append(", GLES2 ");
+        }
         avail=isAvailableImpl(map, GLES2);
         sb.append(avail);
         if(avail) {
-            glAvailabilityToString(device, sb, 2, GLContext.CTX_PROFILE_ES);
+            glAvailabilityToString(device, sb.append(" "), 2, GLContext.CTX_PROFILE_ES);
         }
 
-        sb.append("], Profiles[");
+        if(useIndent) {
+            indentCount--;
+            doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("Profiles");
+            indentCount++;
+        } else {
+            sb.append("], Profiles[");
+        }
+        
         if(null != map) {
             for(Iterator<GLProfile> i=map.values().iterator(); i.hasNext(); ) {
+                if(useIndent) {
+                    doIndent(sb.append(Platform.getNewline()), indent, indentCount);
+                }
                 sb.append(i.next().toString());
-                sb.append(", ");
+                if(!useIndent) {
+                    sb.append(", ");
+                }
+            }
+            if(useIndent) {
+                doIndent(sb.append(Platform.getNewline()), indent, indentCount).append("default ");
+            } else {
+                sb.append(", default ");
             }
-            sb.append(", default ");
             try {
                 sb.append(getDefault(device));
             } catch (GLException gle) {
                 sb.append("n/a");
             }
         }
-        sb.append("]]");
+        if(useIndent) {
+            sb.append(Platform.getNewline());
+        } else {
+            sb.append("]");
+        }
 
-        return sb.toString();
+        return sb;
     }
     
     /** Uses the default device */
@@ -1198,11 +1272,9 @@ public class GLProfile {
     private static /*final*/ boolean hasGLES2Impl;
     private static /*final*/ boolean hasGLES1Impl;
 
-    private static /*final*/ GLDrawableFactoryImpl eglFactory;
-    private static /*final*/ GLDrawableFactoryImpl desktopFactory;
-    private static /*final*/ AbstractGraphicsDevice defaultDevice;
-    private static /*final*/ AbstractGraphicsDevice defaultDesktopDevice;
-    private static /*final*/ AbstractGraphicsDevice defaultEGLDevice;
+    private static /*final*/ GLDrawableFactoryImpl eglFactory = null;
+    private static /*final*/ GLDrawableFactoryImpl desktopFactory = null;
+    private static /*final*/ AbstractGraphicsDevice defaultDevice = null;
 
     private static volatile boolean initialized = false;
     private static RecursiveThreadGroupLock initLock = LockFactory.createRecursiveThreadGroupLock();
@@ -1270,11 +1342,10 @@ public class GLProfile {
         }
 
         if(null == desktopFactory) {
-            hasDesktopGLFactory   = false;
-            hasGL234Impl   = false;
+            hasDesktopGLFactory  = false;
+            hasGL234Impl         = false;
         } else {
-            defaultDesktopDevice = desktopFactory.getDefaultDevice();
-            defaultDevice = defaultDesktopDevice;
+            defaultDevice        = desktopFactory.getDefaultDevice();
         }
 
         if ( ReflectionUtil.isClassAvailable("jogamp.opengl.egl.EGLDrawableFactory", classloader) ) {
@@ -1283,15 +1354,9 @@ public class GLProfile {
                 eglFactory = (GLDrawableFactoryImpl) GLDrawableFactory.getFactoryImpl(GLES2);
                 if(null != eglFactory) {
                     hasEGLFactory = true;
-                    GLDynamicLookupHelper eglLookupHelper = eglFactory.getGLDynamicLookupHelper(2);
                     // update hasGLES1Impl, hasGLES2Impl based on EGL
-                    if(null!=eglLookupHelper) {
-                        hasGLES2Impl = eglLookupHelper.isLibComplete() && hasGLES2Impl;
-                    }
-                    eglLookupHelper = eglFactory.getGLDynamicLookupHelper(1);
-                    if(null!=eglLookupHelper) {
-                        hasGLES1Impl = eglLookupHelper.isLibComplete() && hasGLES1Impl;
-                    }
+                    hasGLES2Impl = null!=eglFactory.getGLDynamicLookupHelper(2) && hasGLES2Impl;
+                    hasGLES1Impl = null!=eglFactory.getGLDynamicLookupHelper(1) && hasGLES1Impl;
                 }
             } catch (LinkageError le) {
                 t=le;
@@ -1313,31 +1378,25 @@ public class GLProfile {
         }
 
         if(null == eglFactory) {
-            hasGLES2Impl   = false;
-            hasGLES1Impl   = false;
-        } else {
-            defaultEGLDevice = eglFactory.getDefaultDevice();
-            if (null==defaultDevice) {
-                defaultDevice = defaultEGLDevice;
-            }
+            hasGLES2Impl     = false;
+            hasGLES1Impl     = false;
+        } else if(null == defaultDevice) {
+            defaultDevice = eglFactory.getDefaultDevice();
         }
 
-        final boolean addedDesktopProfile = initProfilesForDevice(defaultDesktopDevice);
-        final boolean addedEGLProfile = initProfilesForDevice(defaultEGLDevice);
-        final boolean addedAnyProfile = addedDesktopProfile || addedEGLProfile ;
+        final boolean addedAnyProfile = initProfilesForDevice(defaultDevice);
 
         if(DEBUG) {
-            System.err.println("GLProfile.init addedAnyProfile(d/e) "+addedAnyProfile+" ("+addedDesktopProfile+"/"+addedEGLProfile+")");
+            System.err.println("GLProfile.init addedAnyProfile      "+addedAnyProfile);
             System.err.println("GLProfile.init isAWTAvailable       "+isAWTAvailable);
             System.err.println("GLProfile.init hasDesktopGLFactory  "+hasDesktopGLFactory);
             System.err.println("GLProfile.init hasGL234Impl         "+hasGL234Impl);
             System.err.println("GLProfile.init hasEGLFactory        "+hasEGLFactory);
             System.err.println("GLProfile.init hasGLES1Impl         "+hasGLES1Impl);
             System.err.println("GLProfile.init hasGLES2Impl         "+hasGLES2Impl);
-            System.err.println("GLProfile.init defaultDesktopDevice "+defaultDesktopDevice);
-            System.err.println("GLProfile.init defaultEGLDevice     "+defaultEGLDevice);
             System.err.println("GLProfile.init defaultDevice        "+defaultDevice);
-            System.err.println("GLProfile.init: "+array2String(GL_PROFILE_LIST_ALL)+", "+ glAvailabilityToString());
+            System.err.println("GLProfile.init profile order        "+array2String(GL_PROFILE_LIST_ALL));            
+            System.err.println(JoglVersion.getDefaultOpenGLInfo(null));            
         }
     }
 
@@ -1408,8 +1467,12 @@ public class GLProfile {
                                                 1, 5, GLContext.CTX_PROFILE_COMPAT|GLContext.CTX_OPTION_ANY);
             }
             addedDesktopProfile = computeProfileMap(device, false /* desktopCtxUndef*/, false /* esCtxUndef */);
-        } else if( hasEGLFactory && ( hasGLES2Impl || hasGLES1Impl ) && 
-                   ( deviceIsEGLCompatible = eglFactory.getIsDeviceCompatible(device)) ) {
+        }
+        
+        // also test GLES1 and GLES2 on desktop, since we have implementations / emulations available
+        if( hasEGLFactory && ( hasGLES2Impl || hasGLES1Impl ) && 
+            ( deviceIsEGLCompatible = eglFactory.getIsDeviceCompatible(device)) ) {
+            
             // 1st pretend we have all EGL profiles ..
             computeProfileMap(device, false /* desktopCtxUndef*/, true /* esCtxUndef */);
 
@@ -1434,22 +1497,22 @@ public class GLProfile {
             if (DEBUG) {
                 System.err.println("GLProfile.initProfilesForDevice: "+device+": egl Shared Ctx "+eglSharedCtxAvail);
             }
-            if(hasGLES2Impl && null == GLContext.getAvailableGLVersion(device, 2, GLContext.CTX_PROFILE_ES) ) {
-                // nobody yet set the available desktop versions, see {@link GLContextImpl#makeCurrent},
-                // so we have to add the usual suspect
+            if( hasGLES2Impl ) {
+                // The native ES2 impl. overwrites a previous mapping using 'ES2 compatibility' by a desktop profile 
                 GLContext.mapAvailableGLVersion(device,
                                                 2, GLContext.CTX_PROFILE_ES,
-                                                2, 0, GLContext.CTX_PROFILE_ES|GLContext.CTX_OPTION_ANY);
+                                                2, 0, GLContext.CTX_PROFILE_ES|GLContext.CTX_OPTION_ANY|GLContext.CTX_IMPL_ES2_COMPAT);
             }
-            if(hasGLES1Impl && null == GLContext.getAvailableGLVersion(device, 1, GLContext.CTX_PROFILE_ES)) {
-                // nobody yet set the available desktop versions, see {@link GLContextImpl#makeCurrent},
-                // so we have to add the usual suspect
+            if( hasGLES1Impl ) {
+                // Always favor the native ES1 impl.
                 GLContext.mapAvailableGLVersion(device,
                                                 1, GLContext.CTX_PROFILE_ES,
                                                 1, 0, GLContext.CTX_PROFILE_ES|GLContext.CTX_OPTION_ANY);
             }
             addedEGLProfile = computeProfileMap(device, false /* desktopCtxUndef*/, false /* esCtxUndef */);
-        } else {
+        } 
+        
+        if( !addedDesktopProfile && !addedEGLProfile ) {
             setProfileMap(device, new HashMap<String /*GLProfile_name*/, GLProfile>()); // empty
             if(DEBUG) {
                 System.err.println("GLProfile: device could not be initialized: "+device);
@@ -1507,16 +1570,6 @@ public class GLProfile {
         return defaultDevice;
     }
 
-    public static AbstractGraphicsDevice getDefaultDesktopDevice() {
-        initSingleton();
-        return defaultDesktopDevice;
-    }
-
-    public static AbstractGraphicsDevice getDefaultEGLDevice() {
-        initSingleton();
-        return defaultEGLDevice;
-    }
-
     private static String array2String(String[] list) {
         StringBuffer msg = new StringBuffer();
         msg.append("[");
@@ -1529,7 +1582,7 @@ public class GLProfile {
         return msg.toString();
     }
 
-    private static void glAvailabilityToString(AbstractGraphicsDevice device, StringBuffer sb, int major, int profile) {
+    private static void glAvailabilityToString(AbstractGraphicsDevice device, StringBuilder sb, int major, int profile) {
         String str = GLContext.getAvailableGLVersionAsString(device, major, profile);
         if(null==str) {
             throw new GLException("Internal Error");
@@ -1646,6 +1699,20 @@ public class GLProfile {
             return GL2;
         } else if(GLES2.equals(profile) && hasGLES2Impl && ( esCtxUndef || GLContext.isGLES2Available(device))) {
             return GLES2;
+        /**
+         * TODO: GLES2_TRUE_DESKTOP (see: GLContextImpl, GLProfile)
+         * Hack to enable GLES2 for desktop profiles w/ ES2 compatibility,
+         * however .. a consequent implementation would need to have all GL2ES2
+         * implementing profile to also implement GLES2!
+         * Let's rely on GL2ES2 and let the user/impl. query isGLES2Compatible()
+        } else if(GLES2.equals(profile)) {
+            if(hasGL234Impl || hasGLES2Impl) {
+                if(esCtxUndef) {
+                    return GLES2;
+                }
+                return GLContext.getAvailableGLProfile(device, 2, GLContext.CTX_PROFILE_ES);
+            }
+          */
         } else if(GLES1.equals(profile) && hasGLES1Impl && ( esCtxUndef || GLContext.isGLES1Available(device))) {
             return GLES1;
         }
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index 1190af677..9c5263b37 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -57,7 +57,6 @@ import java.awt.geom.Rectangle2D;
 import java.awt.EventQueue;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.List;
 
 import javax.media.nativewindow.AbstractGraphicsConfiguration;
 import javax.media.nativewindow.OffscreenLayerOption;
@@ -234,7 +233,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
     super();
 
     if(null==capsReqUser) {
-        capsReqUser = new GLCapabilities(GLProfile.getDefault(GLProfile.getDefaultDesktopDevice()));
+        capsReqUser = new GLCapabilities(GLProfile.getDefault(GLProfile.getDefaultDevice()));
     } else {
         // don't allow the user to change data
         capsReqUser = (GLCapabilitiesImmutable) capsReqUser.cloneMutable();
@@ -1079,13 +1078,9 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
     // System.err.println(NativeWindowVersion.getInstance());
     System.err.println(JoglVersion.getInstance());
 
-    final GLDrawableFactory factory = GLDrawableFactory.getDesktopFactory();
-    final List<GLCapabilitiesImmutable> availCaps = factory.getAvailableCapabilities(null);
-    for(int i=0; i<availCaps.size(); i++) {
-        System.err.println(availCaps.get(i));
-    }
+    System.err.println(JoglVersion.getDefaultOpenGLInfo(null).toString());
 
-    final GLCapabilitiesImmutable caps = new GLCapabilities( GLProfile.getDefault(GLProfile.getDefaultDesktopDevice()) );
+    final GLCapabilitiesImmutable caps = new GLCapabilities( GLProfile.getDefault(GLProfile.getDefaultDevice()) );
     final Frame frame = new Frame("JOGL AWT Test");
 
     final GLCanvas glCanvas = new GLCanvas(caps);
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index 7a87882ca..4ccd3c97c 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -245,7 +245,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
         if (userCapsRequest != null) {
             caps = (GLCapabilities) userCapsRequest.cloneMutable();
         } else {
-            caps = new GLCapabilities(GLProfile.getDefault(GLProfile.getDefaultDesktopDevice()));
+            caps = new GLCapabilities(GLProfile.getDefault(GLProfile.getDefaultDevice()));
         }
         caps.setDoubleBuffered(false);
         offscreenCaps = caps;
@@ -1336,7 +1336,7 @@ public void reshape(int x, int y, int width, int height) {
 
     public GLProfile getGLProfile() {
       // FIXME: should do better than this; is it possible to using only platform-independent code?
-      return GLProfile.getDefault(GLProfile.getDefaultDesktopDevice());
+      return GLProfile.getDefault(GLProfile.getDefaultDevice());
     }
 
     public void handleReshape() {