2 files changed, 65 insertions, 6 deletions

diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
index d4fc0b005..995ff870e 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
@@ -63,6 +63,7 @@ import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
 import jogamp.nativewindow.macosx.OSXUtil;
 import jogamp.opengl.GLContextImpl;
 import jogamp.opengl.GLDrawableImpl;
+import jogamp.opengl.GLDynamicLookupHelper;
 import jogamp.opengl.GLFBODrawableImpl;
 import jogamp.opengl.GLGraphicsConfigurationUtil;
 import jogamp.opengl.macosx.cgl.MacOSXCGLDrawable.GLBackendType;
@@ -85,6 +86,8 @@ public class MacOSXCGLContext extends GLContextImpl
   // NSOpenGL-based or CGL-based)
   protected interface GLBackendImpl {
         boolean isNSContext();
+        /** Indicating CALayer, i.e. onscreen rendering using offscreen layer. */
+        boolean isUsingCALayer();
         long create(long share, int ctp, int major, int minor);
         boolean destroy(long ctx);
         void associateDrawable(boolean bound);
@@ -108,6 +111,9 @@ public class MacOSXCGLContext extends GLContextImpl
   }
 
   static boolean isGLProfileSupported(final int ctp, final int major, final int minor) {
+    if( 0 != ( CTX_PROFILE_ES & ctp ) ) {
+        return false;
+    }
     final boolean ctBwdCompat = 0 != ( CTX_PROFILE_COMPAT & ctp ) ;
     final boolean ctCore      = 0 != ( CTX_PROFILE_CORE & ctp ) ;
 
@@ -423,12 +429,33 @@ public class MacOSXCGLContext extends GLContextImpl
   }
 
   @Override
-  protected boolean setSwapIntervalImpl(final int interval) {
-    return impl.setSwapInterval(interval);
+  protected final Integer setSwapIntervalImpl2(final int interval) {
+      if( !impl.isUsingCALayer() && !drawable.getChosenGLCapabilities().isOnscreen() ) {
+          return null;
+      }
+      final int useInterval;
+      if( 0 > interval ) {
+          useInterval = Math.abs(interval);
+      } else {
+          useInterval = interval;
+      }
+      if( impl.setSwapInterval(useInterval) ) {
+          return Integer.valueOf(useInterval);
+      }
+      return null;
   }
 
+  /**
+   * {@inheritDoc}
+   * <p>
+   * Ignoring {@code contextFQN}, using {@code MacOSX}-{@link AbstractGraphicsDevice#getUniqueID()}.
+   * </p>
+   */
   @Override
-  protected final void updateGLXProcAddressTable() {
+  protected final void updateGLXProcAddressTable(final String contextFQN, final GLDynamicLookupHelper dlh) {
+    if( null == dlh ) {
+        throw new GLException("No GLDynamicLookupHelper for "+this);
+    }
     final AbstractGraphicsConfiguration aconfig = drawable.getNativeSurface().getGraphicsConfiguration();
     final AbstractGraphicsDevice adevice = aconfig.getScreen().getDevice();
     final String key = "MacOSX-"+adevice.getUniqueID();
@@ -446,7 +473,7 @@ public class MacOSXCGLContext extends GLContextImpl
         }
     } else {
         cglExtProcAddressTable = new CGLExtProcAddressTable(new GLProcAddressResolver());
-        resetProcAddressTable(getCGLExtProcAddressTable());
+        resetProcAddressTable(getCGLExtProcAddressTable(), dlh);
         synchronized(mappedContextTypeObjectLock) {
             mappedGLXProcAddress.put(key, getCGLExtProcAddressTable());
             if(DEBUG) {
@@ -521,6 +548,8 @@ public class MacOSXCGLContext extends GLContextImpl
       @Override
       public boolean isNSContext() { return true; }
 
+      @Override
+      public boolean isUsingCALayer() { return null != backingLayerHost; }
 
       /** Only returns a valid NSView. If !NSView, return null and mark either isPBuffer, isFBO or isSurfaceless. */
       private long getNSViewHandle(final boolean[] isPBuffer, final boolean[] isFBO, final boolean[] isSurfaceless) {
@@ -547,7 +576,7 @@ public class MacOSXCGLContext extends GLContextImpl
                   nsViewHandle = OSXUtil.GetNSView(drawableHandle);
               } else if( isPBuffer[0] ) {
                   nsViewHandle = 0;
-              } else if( isSurfacelessOK() ) {
+              } else if( isSurfaceless() ) {
                   isSurfaceless[0] = true;
                   nsViewHandle = 0;
               } else {
@@ -1128,6 +1157,9 @@ public class MacOSXCGLContext extends GLContextImpl
       public boolean isNSContext() { return false; }
 
       @Override
+      public boolean isUsingCALayer() { return false; }
+
+      @Override
       public long create(final long share, final int ctp, final int major, final int minor) {
           long ctx = 0;
           final MacOSXCGLGraphicsConfiguration config = (MacOSXCGLGraphicsConfiguration) drawable.getNativeSurface().getGraphicsConfiguration();
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
index ab1d56e29..871067f4c 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -148,7 +148,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
   }
 
   @Override
-  public GLDynamicLookupHelper getGLDynamicLookupHelper(final String profileName) {
+  public final GLDynamicLookupHelper getGLDynamicLookupHelper(final int majorVersion, final int contextOptions) {
       return macOSXCGLDynamicLookupHelper;
   }
 
@@ -335,6 +335,33 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
     return null;
   }
 
+  /**
+   * {@inheritDoc}
+   * <p>
+   * This factory always supports native desktop OpenGL profiles.
+   * </p>
+   */
+  @Override
+  public final boolean hasOpenGLDesktopSupport() { return true; }
+
+  /**
+   * {@inheritDoc}
+   * <p>
+   * This factory never supports native GLES profiles.
+   * </p>
+   */
+  @Override
+  public final boolean hasOpenGLESSupport() { return false; }
+
+  /**
+   * {@inheritDoc}
+   * <p>
+   * Always returns true.
+   * </p>
+   */
+  @Override
+  public final boolean hasMajorMinorCreateContextARB() { return true; }
+
   @Override
   protected List<GLCapabilitiesImmutable> getAvailableCapabilitiesImpl(final AbstractGraphicsDevice device) {
       return MacOSXCGLGraphicsConfiguration.getAvailableCapabilities(this, device);