Bug 1202: Fix vsync regression on OSX when using CALayer

On OSX using CALayer for onscreen rendering,
the drawable is utilizing an offscreen FBO.

Hence we need to move the vsync-skip-operation criteria,
i.e. skip if offscreen, down to the implementation.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
index 3c76dc212..5097b21aa 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
@@ -86,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);
@@ -428,6 +430,9 @@ public class MacOSXCGLContext extends GLContextImpl
 
   @Override
   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);
@@ -543,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) {
@@ -1150,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();