8 files changed, 3 insertions, 56 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
 //
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 86d09e480..629816e50 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -372,7 +372,7 @@ function testawtswt() {
 #
 # Stereo
 #
-testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
 
 #
 # HiDPI
@@ -382,7 +382,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
+testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
 #testawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo $*
 #testawt com.jogamp.opengl.test.junit.jogl.awt.ManualHiDPIBufferedImage01AWT $*
 
@@ -709,7 +709,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
 #testawt com.jogamp.opengl.test.junit.jogl.caps.TestTranslucencyNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestTranslucentChildWindowBug632NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestBug605FlippedImageNEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestBug605FlippedImageAWT $*
+#testawt com.jogamp.opengl.test.junit.jogl.caps.TestBug605FlippedImageAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.glsl.TestShaderCompilationBug459AWT
 
 #testnoawt com.jogamp.opengl.test.junit.newt.DemoCreateAndDisposeOnCloseNEWT $*