diff options
Diffstat (limited to 'src/jogl')
8 files changed, 27 insertions, 8 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/GLContext.java b/src/jogl/classes/com/jogamp/opengl/GLContext.java index 258363e2e..45cc1c509 100644 --- a/src/jogl/classes/com/jogamp/opengl/GLContext.java +++ b/src/jogl/classes/com/jogamp/opengl/GLContext.java @@ -1265,7 +1265,14 @@ public abstract class GLContext { * @throws GLException if the context is not current. * @see #getSwapInterval() */ - public abstract boolean setSwapInterval(final int interval) throws GLException; + 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) { + // FIXME: Remove for next version - just here to *not* break SEMVER! + throw new InternalError("Implemented in GLContextImpl"); + } /** * Return the current swap interval. @@ -1279,7 +1286,15 @@ public abstract class GLContext { * </p> * @see #setSwapInterval(int) */ - public abstract int getSwapInterval(); + public /* abstract */ int getSwapInterval() { + // FIXME: Make abstract for next version - just here to *not* break SEMVER! + throw new InternalError("Implemented in GLContextImpl"); + } + + 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, final int[] maxBarriers, final int maxBarriers_offset) { diff --git a/src/jogl/classes/com/jogamp/opengl/GLUniformData.java b/src/jogl/classes/com/jogamp/opengl/GLUniformData.java index 44f7f29c7..55a2e0cf1 100644 --- a/src/jogl/classes/com/jogamp/opengl/GLUniformData.java +++ b/src/jogl/classes/com/jogamp/opengl/GLUniformData.java @@ -84,6 +84,7 @@ public class GLUniformData { public IntBuffer intBufferValue() { return (IntBuffer)data; }; public FloatBuffer floatBufferValue() { return (FloatBuffer)data; }; + @SuppressWarnings("deprecation") public StringBuilder toString(StringBuilder sb) { if(null == sb) { sb = new StringBuilder(); diff --git a/src/jogl/classes/com/jogamp/opengl/math/FloatUtil.java b/src/jogl/classes/com/jogamp/opengl/math/FloatUtil.java index b24339569..7f630f9d5 100644 --- a/src/jogl/classes/com/jogamp/opengl/math/FloatUtil.java +++ b/src/jogl/classes/com/jogamp/opengl/math/FloatUtil.java @@ -1959,6 +1959,7 @@ public final class FloatUtil { * @param columns * @param rowMajorOrder if true floats are layed out in row-major-order, otherwise column-major-order (OpenGL) * @return matrix string representation + * @deprecated use on of the float[] variants */ public static StringBuilder matrixToString(StringBuilder sb, final String rowPrefix, final String f, final FloatBuffer a, final int aOffset, final int rows, final int columns, final boolean rowMajorOrder) { 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 { |