1 files changed, 113 insertions, 109 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/GLContext.java b/src/jogl/classes/com/jogamp/opengl/GLContext.java
index f68c029df..606e4b4ed 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLContext.java
@@ -198,16 +198,19 @@ public abstract class GLContext {
   /** <code>GL_ARB_ES3_compatibility</code> implementation related: Context is compatible w/ ES3. Not a cache key. See {@link #isGLES3Compatible()}, {@link #getAvailableContextProperties(AbstractGraphicsDevice, GLProfile)}. */
   protected static final int CTX_IMPL_ES3_COMPAT  = 1 << 11;
 
-  /** <code>GL_ARB_ES3_1_compatibility</code> implementation related: Context is compatible w/ ES3. Not a cache key. See {@link #isGLES31Compatible()}, {@link #getAvailableContextProperties(AbstractGraphicsDevice, GLProfile)}. */
+  /** <code>GL_ARB_ES3_1_compatibility</code> implementation related: Context is compatible w/ ES 3.1. Not a cache key. See {@link #isGLES31Compatible()}, {@link #getAvailableContextProperties(AbstractGraphicsDevice, GLProfile)}. */
   protected static final int CTX_IMPL_ES31_COMPAT = 1 << 12;
 
+  /** <code>GL_ARB_ES3_2_compatibility</code> implementation related: Context is compatible w/ ES 3.2. Not a cache key. See {@link #isGLES32Compatible()}, {@link #getAvailableContextProperties(AbstractGraphicsDevice, GLProfile)}. */
+  protected static final int CTX_IMPL_ES32_COMPAT = 1 << 13;
+
   /**
    * Context supports basic FBO, details see {@link #hasBasicFBOSupport()}.
    * Not a cache key.
    * @see #hasBasicFBOSupport()
    * @see #getAvailableContextProperties(AbstractGraphicsDevice, GLProfile)
    */
-  protected static final int CTX_IMPL_FBO         = 1 << 13;
+  protected static final int CTX_IMPL_FBO         = 1 << 14;
 
   /**
    * Context supports <code>OES_single_precision</code>, fp32, fixed function point (FFP) compatibility entry points,
@@ -216,7 +219,7 @@ public abstract class GLContext {
    * @see #hasFP32CompatAPI()
    * @see #getAvailableContextProperties(AbstractGraphicsDevice, GLProfile)
    */
-  protected static final int CTX_IMPL_FP32_COMPAT_API = 1 << 14;
+  protected static final int CTX_IMPL_FP32_COMPAT_API = 1 << 15;
 
   private static final ThreadLocal<GLContext> currentContext = new ThreadLocal<GLContext>();
 
@@ -237,7 +240,6 @@ public abstract class GLContext {
   protected String ctxVersionString;
   protected VersionNumberString ctxVendorVersion;
   protected VersionNumber ctxGLSLVersion;
-  private int currentSwapInterval;
   protected GLRendererQuirks glRendererQuirks;
 
   /** Did the drawable association changed ? see {@link GLRendererQuirks#NoSetSwapIntervalPostRetarget} */
@@ -258,7 +260,6 @@ public abstract class GLContext {
       ctxGLSLVersion = VersionNumber.zeroVersion;
       attachedObjects.clear();
       contextHandle=0;
-      currentSwapInterval = -1;
       glRendererQuirks = null;
       drawableRetargeted = false;
   }
@@ -925,6 +926,17 @@ public abstract class GLContext {
   }
 
   /**
+   * Return true if this context is an ES3 context &ge; 3.2 or implements
+   * the extension <code>GL_ARB_ES3_2_compatibility</code>, otherwise false.
+   * <p>
+   * Includes [ GL &ge; 4.5, GL &ge; 3.1 w/ GL_ARB_ES3_2_compatibility and GLES3 &ge; 3.2 ]
+   * </p>
+   */
+  public final boolean isGLES32Compatible() {
+      return 0 != ( ctxOptions & CTX_IMPL_ES32_COMPAT ) ;
+  }
+
+  /**
    * @return true if impl. is a hardware rasterizer, otherwise false.
    * @see #isHardwareRasterizer(AbstractGraphicsDevice, GLProfile)
    * @see GLProfile#isHardwareRasterizer()
@@ -1182,8 +1194,9 @@ public abstract class GLContext {
       if( 0 != ( ctxOptions & CTX_PROFILE_ES ) ) {
           final int major = ctxVersion.getMajor();
           return 2 == major || 3 == major;
+      } else {
+          return false;
       }
-      return false;
   }
 
   /**
@@ -1246,49 +1259,55 @@ public abstract class GLContext {
   }
 
   /**
-   * Set the swap interval of the current context and attached drawable.
-   * @param interval Should be &ge; 0. 0 disables the vertical synchronization,
-   *                 where &ge; 1 is the number of vertical refreshes before a swap buffer occurs.
-   *                 A value &lt; 0 is ignored.
+   * Set the swap interval of the current context and attached <i>onscreen {@link GLDrawable}</i>.
+   * <p>
+   * <i>offscreen {@link GLDrawable}</i> are ignored and {@code false} is returned.
+   * </p>
+   * <p>
+   * The {@code interval} semantics:
+   * <ul>
+   *   <li><i>0</i> disables the vertical synchronization</li>
+   *   <li><i>&ge;1</i> is the number of vertical refreshes before a swap buffer occurs</li>
+   *   <li><i>&lt;0</i> enables <i>late swaps to occur without synchronization to the video frame</i>, a.k.a <i>EXT_swap_control_tear</i>.
+   *              If supported, the absolute value is the minimum number of
+   *              video frames between buffer swaps. If not supported, the absolute value is being used, see above.
+   *   </li>
+   * </ul>
+   * </p>
+   * @param interval see above
    * @return true if the operation was successful, otherwise false
-   *
    * @throws GLException if the context is not current.
+   * @see #getSwapInterval()
    */
-  public final boolean setSwapInterval(final int interval) throws GLException {
-    validateCurrent();
-    if(0<=interval) {
-        if( !drawableRetargeted || !hasRendererQuirk(GLRendererQuirks.NoSetSwapIntervalPostRetarget) ) {
-            if( setSwapIntervalImpl(interval) ) {
-                currentSwapInterval = interval;
-                return true;
-            }
-        }
-    }
-    return false;
+  public /* abstract */ boolean setSwapInterval(final int interval) throws GLException {
+      // FIXME: Make abstract for next version - just here to *not* break SEMVER!
+      throw new InternalError("Implemented in GLContextImpl");
   }
   protected boolean setSwapIntervalImpl(final int interval) {
-      return false;
+      // FIXME: Remove for next version - just here to *not* break SEMVER!
+      throw new InternalError("Implemented in GLContextImpl");
   }
-  /** Return the current swap interval.
+
+  /**
+   * Return the current swap interval.
    * <p>
    * If the context has not been made current at all,
-   * the default value <code>-1</code> is returned.
+   * the default value {@code 0} is returned.
    * </p>
    * <p>
-   * For a valid context the default value is <code>1</code>
-   * in case of an EGL based profile (ES1 or ES2) and <code>-1</code>
-   * (undefined) for desktop.
+   * For a valid context w/ an <o>onscreen {@link GLDrawable}</i> the default value is {@code 1},
+   * otherwise the default value is {@code 0}.
    * </p>
+   * @see #setSwapInterval(int)
    */
-  public final int getSwapInterval() {
-    return currentSwapInterval;
+  public /* abstract */ int getSwapInterval() {
+      // FIXME: Make abstract for next version - just here to *not* break SEMVER!
+      throw new InternalError("Implemented in GLContextImpl");
   }
-  protected final void setDefaultSwapInterval() {
-    if(this.isGLES()) {
-        currentSwapInterval = 1;
-    } else {
-        currentSwapInterval = -1;
-    }
+
+  protected void setDefaultSwapInterval() {
+      // FIXME: Remove for next version - just here to *not* break SEMVER!
+      throw new InternalError("Implemented in GLContextImpl");
   }
 
   public final boolean queryMaxSwapGroups(final int[] maxGroups, final int maxGroups_offset,
@@ -1492,7 +1511,7 @@ public abstract class GLContext {
       /* 0.*/ { -1 },
       /* 1.*/ { 0, 1 },
       /* 2.*/ { 0 },
-      /* 3.*/ { 0, 1 } };
+      /* 3.*/ { 0, 1, 2 } };
 
   public static final int getMaxMajor(final int ctxProfile) {
       return ( 0 != ( CTX_PROFILE_ES & ctxProfile ) ) ? ES_VERSIONS.length-1 : GL_VERSIONS.length-1;
@@ -1613,8 +1632,14 @@ public abstract class GLContext {
             ( ( b8    & 0x000000FF ) << 16 ) |
             ( ( c16   & 0x0000FFFF )       ) ;
   }
+  protected static VersionNumber decomposeBits(final int bits32, final int[] ctp) {
+      final int major = ( bits32 & 0xFF000000 ) >>> 24 ;
+      final int minor = ( bits32 & 0x00FF0000 ) >>> 16 ;
+      ctp[0]          = ( bits32 & 0x0000FFFF )        ;
+      return new VersionNumber(major, minor, 0);
+  }
 
-  private static void validateProfileBits(final int bits, final String argName) {
+  protected static void validateProfileBits(final int bits, final String argName) {
     int num = 0;
     if( 0 != ( CTX_PROFILE_COMPAT & bits ) ) { num++; }
     if( 0 != ( CTX_PROFILE_CORE   & bits ) ) { num++; }
@@ -1660,7 +1685,7 @@ public abstract class GLContext {
               deviceVersionsAvailableSet.remove(devKey);
           }
           if (DEBUG) {
-            System.err.println(getThreadName() + ": createContextARB: SET mappedVersionsAvailableSet "+devKey);
+            System.err.println(getThreadName() + ": createContextARB-MapGLVersions SET "+devKey);
             System.err.println(GLContext.dumpAvailableGLVersions(null).toString());
           }
       }
@@ -1675,38 +1700,6 @@ public abstract class GLContext {
       return r.intern();
   }
 
-  /**
-   * Called by {@link jogamp.opengl.GLContextImpl#createContextARBMapVersionsAvailable(int,int)} not intended to be used by
-   * implementations. However, if {@link jogamp.opengl.GLContextImpl#createContextARB(long, boolean)} is not being used within
-   * {@link com.jogamp.opengl.GLDrawableFactory#getOrCreateSharedContext(com.jogamp.nativewindow.AbstractGraphicsDevice)},
-   * GLProfile has to map the available versions.
-   *
-   * @param reqMajor 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 old mapped value
-   *
-   * @see #createContextARBMapVersionsAvailable
-   */
-  protected static Integer mapAvailableGLVersion(final AbstractGraphicsDevice device,
-                                                 final int reqMajor, final int profile, final int resMajor, final int resMinor, int resCtp)
-  {
-    validateProfileBits(profile, "profile");
-    validateProfileBits(resCtp, "resCtp");
-
-    if(FORCE_NO_FBO_SUPPORT) {
-        resCtp &= ~CTX_IMPL_FBO ;
-    }
-    if(DEBUG) {
-        System.err.println("GLContext.mapAvailableGLVersion: "+device+": "+getGLVersion(reqMajor, 0, profile, null)+" -> "+getGLVersion(resMajor, resMinor, resCtp, null));
-        // Thread.dumpStack();
-    }
-    final String objectKey = getDeviceVersionAvailableKey(device, reqMajor, profile);
-    final Integer val = Integer.valueOf(composeBits(resMajor, resMinor, resCtp));
-    synchronized(deviceVersionAvailable) {
-        return deviceVersionAvailable.put( objectKey, val );
-    }
-  }
-
   protected static StringBuilder dumpAvailableGLVersions(StringBuilder sb) {
     if(null == sb) {
         sb = new StringBuilder();
@@ -1714,19 +1707,17 @@ public abstract class GLContext {
     synchronized(deviceVersionAvailable) {
         final Set<String> keys = deviceVersionAvailable.keySet();
         boolean needsSeparator = false;
-        for(final Iterator<String> i = keys.iterator(); i.hasNext(); ) {
+        for(final Iterator<String> keyI = keys.iterator(); keyI.hasNext(); ) {
             if(needsSeparator) {
                 sb.append(Platform.getNewline());
             }
-            final String key = i.next();
-            sb.append(key).append(": ");
+            final String key = keyI.next();
+            sb.append("MapGLVersions ").append(key).append(": ");
             final Integer valI = deviceVersionAvailable.get(key);
             if(null != valI) {
-                final int bits32 = valI.intValue();
-                final int major = ( bits32 & 0xFF000000 ) >>> 24 ;
-                final int minor = ( bits32 & 0x00FF0000 ) >>> 16 ;
-                final int ctp   = ( bits32 & 0x0000FFFF )       ;
-                sb.append(GLContext.getGLVersion(major, minor, ctp, null));
+                final int[] ctp = { 0 };
+                final VersionNumber version = decomposeBits(valI.intValue(), ctp);
+                GLContext.getGLVersion(sb, version, ctp[0], null);
             } else {
                 sb.append("n/a");
             }
@@ -1949,15 +1940,7 @@ public abstract class GLContext {
       return isGLVersionAvailable(device, 3, GLContext.CTX_PROFILE_ES, isHardware);
   }
 
-  /**
-   * Returns true if a ES3 compatible profile is available,
-   * i.e. either a &ge; 4.3 context or a &ge; 3.1 context supporting <code>GL_ARB_ES3_compatibility</code>,
-   * otherwise false.
-   * <p>
-   * Includes [ GL &ge; 4.3, GL &ge; 3.1 w/ GL_ARB_ES3_compatibility and GLES3 ]
-   * </p>
-   */
-  public static final boolean isGLES3CompatibleAvailable(final AbstractGraphicsDevice device) {
+  private static final int getGL3ctp(final AbstractGraphicsDevice device) {
       final int major[] = { 0 };
       final int minor[] = { 0 };
       final int ctp[] = { 0 };
@@ -1970,7 +1953,19 @@ public abstract class GLContext {
       if( !ok ) {
           GLContext.getAvailableGLVersion(device, 3, GLContext.CTX_PROFILE_COMPAT, major, minor, ctp);
       }
-      return 0 != ( ctp[0] & CTX_IMPL_ES3_COMPAT );
+      return ctp[0];
+  }
+
+  /**
+   * Returns true if a ES3 compatible profile is available,
+   * i.e. either a &ge; 4.3 context or a &ge; 3.1 context supporting <code>GL_ARB_ES3_compatibility</code>,
+   * otherwise false.
+   * <p>
+   * Includes [ GL &ge; 4.3, GL &ge; 3.1 w/ GL_ARB_ES3_compatibility and GLES3 ]
+   * </p>
+   */
+  public static final boolean isGLES3CompatibleAvailable(final AbstractGraphicsDevice device) {
+      return 0 != ( getGL3ctp(device) & CTX_IMPL_ES3_COMPAT );
   }
   /**
    * Returns true if a ES3 &ge; 3.1 compatible profile is available,
@@ -1981,19 +1976,18 @@ public abstract class GLContext {
    * </p>
    */
   public static final boolean isGLES31CompatibleAvailable(final AbstractGraphicsDevice device) {
-      final int major[] = { 0 };
-      final int minor[] = { 0 };
-      final int ctp[] = { 0 };
-      boolean ok;
-
-      ok = GLContext.getAvailableGLVersion(device, 3, GLContext.CTX_PROFILE_ES, major, minor, ctp);
-      if( !ok ) {
-          ok = GLContext.getAvailableGLVersion(device, 3, GLContext.CTX_PROFILE_CORE, major, minor, ctp);
-      }
-      if( !ok ) {
-          GLContext.getAvailableGLVersion(device, 3, GLContext.CTX_PROFILE_COMPAT, major, minor, ctp);
-      }
-      return 0 != ( ctp[0] & CTX_IMPL_ES31_COMPAT );
+      return 0 != ( getGL3ctp(device) & CTX_IMPL_ES31_COMPAT );
+  }
+  /**
+   * Returns true if a ES3 &ge; 3.2 compatible profile is available,
+   * i.e. either a &ge; 4.5 context or a &ge; 3.1 context supporting <code>GL_ARB_ES3_2_compatibility</code>,
+   * otherwise false.
+   * <p>
+   * Includes [ GL &ge; 4.5, GL &ge; 3.1 w/ GL_ARB_ES3_2_compatibility and GLES3 &ge; 3.2 ]
+   * </p>
+   */
+  public static final boolean isGLES32CompatibleAvailable(final AbstractGraphicsDevice device) {
+      return 0 != ( getGL3ctp(device) & CTX_IMPL_ES32_COMPAT );
   }
 
   public static boolean isGL4bcAvailable(final AbstractGraphicsDevice device, final boolean isHardware[]) {
@@ -2016,13 +2010,8 @@ public abstract class GLContext {
     return isGLVersionAvailable(device, 2, CTX_PROFILE_COMPAT, isHardware);
   }
 
-  protected static String getGLVersion(final int major, final int minor, final int ctp, final String gl_version) {
+  protected static StringBuilder getGLProfile(final StringBuilder sb, final int ctp) {
     boolean needColon = false;
-    final StringBuilder sb = new StringBuilder();
-    sb.append(major);
-    sb.append(".");
-    sb.append(minor);
-    sb.append(" (");
     needColon = appendString(sb, "ES profile",            needColon, 0 != ( CTX_PROFILE_ES & ctp ));
     needColon = appendString(sb, "Compat profile",        needColon, 0 != ( CTX_PROFILE_COMPAT & ctp ));
     needColon = appendString(sb, "Core profile",          needColon, 0 != ( CTX_PROFILE_CORE & ctp ));
@@ -2035,6 +2024,7 @@ public abstract class GLContext {
         needColon = appendString(sb, "ES2",               needColon, 0 != ( CTX_IMPL_ES2_COMPAT & ctp ));
         needColon = appendString(sb, "ES3",               needColon, 0 != ( CTX_IMPL_ES3_COMPAT & ctp ));
         needColon = appendString(sb, "ES31",              needColon, 0 != ( CTX_IMPL_ES31_COMPAT & ctp ));
+        needColon = appendString(sb, "ES32",              needColon, 0 != ( CTX_IMPL_ES32_COMPAT & ctp ));
         needColon = appendString(sb, "FP32",              needColon, 0 != ( CTX_IMPL_FP32_COMPAT_API & ctp ));
         needColon = false;
     }
@@ -2045,12 +2035,26 @@ public abstract class GLContext {
     } else {
         needColon = appendString(sb, "hardware",          needColon, true);
     }
+    return sb;
+  }
+  protected static StringBuilder getGLVersion(final StringBuilder sb, final VersionNumber version, final int ctp, final String gl_version) {
+      return getGLVersion(sb, version.getMajor(), version.getMinor(), ctp, gl_version);
+  }
+  protected static StringBuilder getGLVersion(final StringBuilder sb, final int major, final int minor, final int ctp, final String gl_version) {
+    sb.append(major);
+    sb.append(".");
+    sb.append(minor);
+    sb.append(" (");
+    getGLProfile(sb, ctp);
     sb.append(")");
     if(null!=gl_version) {
         sb.append(" - ");
         sb.append(gl_version);
     }
-    return sb.toString();
+    return sb;
+  }
+  protected static String getGLVersion(final int major, final int minor, final int ctp, final String gl_version) {
+      return getGLVersion(new StringBuilder(), major, minor, ctp, gl_version).toString();
   }
 
   //