diff options
author | Sven Gothel <[email protected]> | 2015-08-29 20:21:29 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-08-29 20:21:29 +0200 |
commit | 1d1b3f92a7c8021198e44bc4b2d6494ab789ddd3 (patch) | |
tree | 25ed1b69bdca820c1dd23eb6f7d3e22782d37b1b /src/jogl/classes/jogamp | |
parent | 7140081033444abf95d2f8289eaa62ead41cf2e0 (diff) |
Bug 1202 (related): Fix SEMVER regressions mostly due to Bug 1202 commits (adding dummy methods)
Commits deff49c901915e007f43a1df1a0d217a786e9f06 and 6ab634654f58afcf4549fcd1a796a0f9fd13298c
changed/removed a few protected methods of public classes ..
Re-added dummy methods .. shall be removed for next 2.4.* version
Diffstat (limited to 'src/jogl/classes/jogamp')
5 files changed, 8 insertions, 6 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index fff6d58e0..8c235a747 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -2616,7 +2616,7 @@ public abstract class GLContextImpl extends GLContext { ( !drawableRetargeted || !hasRendererQuirk(GLRendererQuirks.NoSetSwapIntervalPostRetarget) ) ) { - final Integer usedInterval = setSwapIntervalImpl(interval); + final Integer usedInterval = setSwapIntervalImpl2(interval); if( null != usedInterval ) { currentSwapInterval = usedInterval.intValue(); return true; @@ -2624,11 +2624,13 @@ public abstract class GLContextImpl extends GLContext { } return false; } - protected abstract Integer setSwapIntervalImpl(final int interval); + protected abstract Integer setSwapIntervalImpl2(final int interval); + @Override public final int getSwapInterval() { return currentSwapInterval; } + @Override protected final void setDefaultSwapInterval() { currentSwapInterval = 0; setSwapIntervalNC(1); diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java index 8c86f5199..f0040f989 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLContext.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLContext.java @@ -433,7 +433,7 @@ public class EGLContext extends GLContextImpl { } @Override - protected final Integer setSwapIntervalImpl(final int interval) { + protected final Integer setSwapIntervalImpl2(final int interval) { if( hasRendererQuirk(GLRendererQuirks.NoSetSwapInterval) ) { return null; } diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java index 10a11dd36..6a042b615 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java @@ -424,7 +424,7 @@ public class MacOSXCGLContext extends GLContextImpl } @Override - protected final Integer setSwapIntervalImpl(final int interval) { + protected final Integer setSwapIntervalImpl2(final int interval) { final int useInterval; if( 0 > interval ) { useInterval = Math.abs(interval); diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java index 3cf9917e3..3d397b893 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java @@ -511,7 +511,7 @@ public class WindowsWGLContext extends GLContextImpl { } @Override - protected final Integer setSwapIntervalImpl(final int interval) { + protected final Integer setSwapIntervalImpl2(final int interval) { 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 e4418b431..79768d662 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java @@ -570,7 +570,7 @@ public class X11GLXContext extends GLContextImpl { } @Override - protected final Integer setSwapIntervalImpl(final int interval) { + protected final Integer setSwapIntervalImpl2(final int interval) { final long displayHandle = drawable.getNativeSurface().getDisplayHandle(); if( 0 == hasSwapInterval ) { try { |