diff options
author | Sven Gothel <[email protected]> | 2014-07-10 01:11:00 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-07-10 01:11:00 +0200 |
commit | ec2d94ca26ddab8ec67135ebc5f2d0a43f6a4c25 (patch) | |
tree | e405f17400b8d52ffe38347d226ca9927ac4f3ec /make/config | |
parent | efa5f1110725d41b7ea58010fe34b2a8aacd185b (diff) |
Bug 1031: Remove Deprecated Classes and Methods (JOGL)
Removed Deprecated Class:
- com/jogamp/opengl/util/TGAWriter.java
- Use TextureIO w/ .tga suffix
- com/jogamp/opengl/util/awt/Screenshot.java
- Use:
- com.jogamp.opengl.util.GLReadBufferUtil, or
- com.jogamp.opengl.util.awt.AWTGLReadBufferUtil
The latter for reading into AWT BufferedImage
See: TestBug461FBOSupersamplingSwingAWT, TestBug605FlippedImageAWT
- javax/media/opengl/GLPbuffer.java
- Use:
caps.setPBuffer(true);
final GLAutoDrawable pbuffer = GLDrawableFactory.getFactory( caps.getGLProfile() ).createOffscreenAutoDrawable(null, caps, null, 512, 512);
- See: TestPBufferDeadlockAWT, ..
Removed Deprecated Methods:
- Constructor of AWT-GLCanvas, SWT-GLCanvas, AWT-GLJPanel
with argument 'final GLContext shareWith'
See GLSharedContextSetter, i.e. glCanvas.setSharedContext(..) !
- GLDrawableFactory.createOffscreenAutoDrawable(..)
with argument 'final GLContext shareWith'
See GLSharedContextSetter, i.e. offscreenAutoDrawable.setSharedContext(..) !
- GLDrawableFactory.createGLPbuffer(..),
see above!
- com.jogamp.opengl.util.av.AudioSink 'enqueueData(AudioDataFrame audioDataFrame)',
use 'enqueueData(int, ByteBuffer, int)'
- GLSharedContextSetter.areAllGLEventListenerInitialized(),
migrated to GLAutoDrawable !
- GLBase's
- glGetBoundBuffer(int), use getBoundBuffer(int)
- glGetBufferSize(int), use getBufferStorage(int).getSize()
- glIsVBOArrayBound(), use isVBOArrayBound()
- glIsVBOElementArrayBound(), use isVBOElementArrayBound()
- NEWT MouseEvent.BUTTON_NUMBER, use BUTTON_COUNT
Diffstat (limited to 'make/config')
-rw-r--r-- | make/config/jogl/gl-if-CustomJavaCode-es3.java | 4 | ||||
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-common.java | 16 | ||||
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 8 | ||||
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gles3.java | 8 | ||||
-rw-r--r-- | make/config/jogl/glu-CustomJavaCode-base.java | 4 | ||||
-rw-r--r-- | make/config/jogl/glu-CustomJavaCode-gl2.java | 7 | ||||
-rw-r--r-- | make/config/jogl/glu-CustomJavaCode-gl2es1.java | 6 |
7 files changed, 0 insertions, 53 deletions
diff --git a/make/config/jogl/gl-if-CustomJavaCode-es3.java b/make/config/jogl/gl-if-CustomJavaCode-es3.java index 3f976d514..88c557f11 100644 --- a/make/config/jogl/gl-if-CustomJavaCode-es3.java +++ b/make/config/jogl/gl-if-CustomJavaCode-es3.java @@ -8,11 +8,7 @@ public static final long GL_TIMEOUT_IGNORED = 0xFFFFFFFFFFFFFFFFL ; /** Part of <code>GL_ARB_shader_image_load_store</code> */ public static final int GL_ALL_BARRIER_BITS = 0xFFFFFFFF ; -/** @deprecated Avoid original GL API namespace conflict. Use {@link #isPBOPackBound()} */ -public boolean glIsPBOPackBound(); public boolean isPBOPackBound(); -/** @deprecated Avoid original GL API namespace conflict. Use {@link #isPBOUnpackBound()} */ -public boolean glIsPBOUnpackBound(); public boolean isPBOUnpackBound(); diff --git a/make/config/jogl/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java index f0246355e..a2ca12960 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-common.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java @@ -5,37 +5,21 @@ private final GLProfile glProfile; @Override - public final int glGetBoundBuffer(int target) { - return getBoundBuffer(target); - } - @Override public final int getBoundBuffer(int target) { return bufferStateTracker.getBoundBufferObject(target, this); } @Override - public final long glGetBufferSize(int bufferName) { - return bufferObjectTracker.getBufferSize(bufferName); - } - @Override public final GLBufferStorage getBufferStorage(int bufferName) { return bufferObjectTracker.getBufferStorage(bufferName); } @Override - public final boolean glIsVBOArrayBound() { - return isVBOArrayBound(); - } - @Override public final boolean isVBOArrayBound() { return checkArrayVBOBound(false); } @Override - public final boolean glIsVBOElementArrayBound() { - return isVBOElementArrayBound(); - } - @Override public final boolean isVBOElementArrayBound() { return checkElementVBOBound(false); } diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java index f0adb5328..a8b5f8320 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java @@ -426,19 +426,11 @@ private final boolean checkPackPBOBound(boolean throwException) { } @Override -public final boolean glIsPBOPackBound() { - return isPBOPackBound(); -} -@Override public final boolean isPBOPackBound() { return checkPackPBOBound(false); } @Override -public final boolean glIsPBOUnpackBound() { - return isPBOUnpackBound(); -} -@Override public final boolean isPBOUnpackBound() { return checkUnpackPBOBound(false); } diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java index a5c0d1998..42adca4b1 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java @@ -329,19 +329,11 @@ private final boolean checkPackPBOBound(boolean throwException) { } @Override -public final boolean glIsPBOPackBound() { - return isPBOPackBound(); -} -@Override public final boolean isPBOPackBound() { return checkPackPBOBound(false); } @Override -public final boolean glIsPBOUnpackBound() { - return isPBOUnpackBound(); -} -@Override public final boolean isPBOUnpackBound() { return checkUnpackPBOBound(false); } diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java index 606583acf..e8047d9d7 100644 --- a/make/config/jogl/glu-CustomJavaCode-base.java +++ b/make/config/jogl/glu-CustomJavaCode-base.java @@ -131,10 +131,6 @@ public GLU() project = new ProjectFloat(); } -/** @deprecated No more used, NOP */ -public void destroy() { -} - public static final GL getCurrentGL() throws GLException { GLContext curContext = GLContext.getCurrent(); if (curContext == null) { diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java index b416d53f9..d7ba58de4 100644 --- a/make/config/jogl/glu-CustomJavaCode-gl2.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2.java @@ -38,13 +38,6 @@ public GLUgl2() project = new ProjectDouble(); } -/** @deprecated No more used, NOP */ -@Override -public void destroy() { - super.destroy(); -} - - //---------------------------------------------------------------------- // Utility routines // diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java index ad242be21..41a7e5b9b 100644 --- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java @@ -40,12 +40,6 @@ public GLUgl2es1() super(); } -/** @deprecated No more used, NOP */ -@Override -public void destroy() { - super.destroy(); -} - //---------------------------------------------------------------------- // Utility routines // |