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.

6 files changed, 22 insertions, 5 deletions

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index fca77a161..4ce43dc6c 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -427,7 +427,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2SimpleNEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $*
-#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $*
+testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $*
@@ -621,7 +621,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteGLWindows01NEWT $*
 
 #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $*
-testnoawt com.jogamp.opengl.test.junit.newt.TestWindows02NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.newt.TestWindows02NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowAndPointerIconNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT $*
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 6e904d0ed..3d2c9a3e1 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -2636,8 +2636,8 @@ public abstract class GLContextImpl extends GLContext {
     return setSwapIntervalNC(interval);
   }
   protected final boolean setSwapIntervalNC(final int interval) throws GLException {
-    if( drawable.getChosenGLCapabilities().isOnscreen() &&
-        ( !drawableRetargeted || !hasRendererQuirk(GLRendererQuirks.NoSetSwapIntervalPostRetarget) )
+    if( !drawableRetargeted ||
+        !hasRendererQuirk(GLRendererQuirks.NoSetSwapIntervalPostRetarget)
       )
     {
         final Integer usedInterval = setSwapIntervalImpl2(interval);
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
index a9d025e01..28448d537 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java
@@ -433,7 +433,8 @@ public class EGLContext extends GLContextImpl {
 
     @Override
     protected final Integer setSwapIntervalImpl2(final int interval) {
-        if( hasRendererQuirk(GLRendererQuirks.NoSetSwapInterval) ) {
+        if( !drawable.getChosenGLCapabilities().isOnscreen() ||
+            hasRendererQuirk(GLRendererQuirks.NoSetSwapInterval) ) {
             return null;
         }
         final int useInterval;
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();
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java
index 4c9469f17..fd0db7c04 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java
@@ -524,6 +524,9 @@ public class WindowsWGLContext extends GLContextImpl {
 
   @Override
   protected final Integer setSwapIntervalImpl2(final int interval) {
+    if( !drawable.getChosenGLCapabilities().isOnscreen() ) {
+        return null;
+    }
     if( 0 == hasSwapInterval ) {
         try {
             if ( isExtensionAvailable(GLXExtensions.WGL_EXT_swap_control) ) {
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
index 9af534f35..24f2ab8dd 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java
@@ -581,6 +581,9 @@ public class X11GLXContext extends GLContextImpl {
 
   @Override
   protected final Integer setSwapIntervalImpl2(final int interval) {
+    if( !drawable.getChosenGLCapabilities().isOnscreen() ) {
+        return null;
+    }
     final long displayHandle = drawable.getNativeSurface().getDisplayHandle();
     if( 0 == hasSwapInterval ) {
         try {