Resolve RenameJavaSymbol issues (GLUgl2 and CGL) using GLEmitter (-> DelegateImplementation) due to new GlueGen Semanticsv2.3.0

GlueGen would usually use the original native C method name
for proc-address or direct call.

GLEmitter however uses the renamed method name,
assuming it is shorter and resulted from a 'RenameExtensionIntoCore' directive.

GLUgl2 native usage was broken since 2.2.4

GLUgl2 and CGL use RenameJavaSymbol w/ the intention of delegation,
hence resolve the issue using the new DelegateImplementation directive
which preserves the original function name for the native call.

3 files changed, 13 insertions, 16 deletions

diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg
index 6ca0787b5..df39bdaab 100644
--- a/make/config/jogl/cgl-macosx.cfg
+++ b/make/config/jogl/cgl-macosx.cfg
@@ -37,12 +37,9 @@ Opaque long NSOpenGLLayer *
 CustomCCode #include <machine/types.h>
 CustomCCode #include "macosx-window-system.h"
 
-AccessControl createNSOpenGLLayerImpl PRIVATE
-AccessControl setNSOpenGLLayerEnabledImpl PRIVATE
-AccessControl releaseNSOpenGLLayerImpl PRIVATE
-RenameJavaSymbol createNSOpenGLLayer createNSOpenGLLayerImpl
-RenameJavaSymbol setNSOpenGLLayerEnabled setNSOpenGLLayerEnabledImpl
-RenameJavaSymbol releaseNSOpenGLLayer releaseNSOpenGLLayerImpl
+DelegateImplementation createNSOpenGLLayer createNSOpenGLLayerImpl
+DelegateImplementation setNSOpenGLLayerEnabled setNSOpenGLLayerEnabledImpl
+DelegateImplementation releaseNSOpenGLLayer releaseNSOpenGLLayerImpl
 
 IncludeAs CustomJavaCode CGL cgl-macosx-CustomJavaCode.java
 
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index dea7992f7..54b9a15ad 100644
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -69,12 +69,12 @@ AccessControl gluScaleImage          PRIVATE
 
 # Rename these methods in the implementing class
 
-RenameJavaSymbol gluBuild1DMipmapLevels gluBuild1DMipmapLevelsC
-RenameJavaSymbol gluBuild1DMipmaps      gluBuild1DMipmapsC
-RenameJavaSymbol gluBuild2DMipmapLevels gluBuild2DMipmapLevelsC
-RenameJavaSymbol gluBuild2DMipmaps      gluBuild2DMipmapsC
-RenameJavaSymbol gluBuild3DMipmapLevels gluBuild3DMipmapLevelsC
-RenameJavaSymbol gluBuild3DMipmaps      gluBuild3DMipmapsC
-RenameJavaSymbol gluScaleImage          gluScaleImageC
+DelegateImplementation gluBuild1DMipmapLevels gluBuild1DMipmapLevelsC
+DelegateImplementation gluBuild1DMipmaps      gluBuild1DMipmapsC
+DelegateImplementation gluBuild2DMipmapLevels gluBuild2DMipmapLevelsC
+DelegateImplementation gluBuild2DMipmaps      gluBuild2DMipmapsC
+DelegateImplementation gluBuild3DMipmapLevels gluBuild3DMipmapLevelsC
+DelegateImplementation gluBuild3DMipmaps      gluBuild3DMipmapsC
+DelegateImplementation gluScaleImage          gluScaleImageC
 
 Include glu-common.cfg
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 16bd57c1f..316262606 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -107,9 +107,9 @@ function jrun() {
     #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
 
     #D_ARGS="-Djogamp.debug.NativeLibrary=true -Djogamp.debug.JNILibLoader=true"
-    #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil"
     #D_ARGS="-Djogl.debug.GLContext -Djogamp.debug.NativeLibrary -Djogamp.debug.JNILibLoader -Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler"
     #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil"
+    #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogl.glu.nojava=true"
 
     #D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
     #D_ARGS="-Dnativewindow.debug=all -Dnewt.debug.Window"
@@ -505,7 +505,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLException01NEWT $*
 
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBufferRead01NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBufferRead01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 
@@ -689,7 +689,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBufferRead01NEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.awt.TestIsRealizedConcurrency01AWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.awt.text.TestAWTTextRendererUseVertexArrayBug464
 #testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug463ScaleImageMemoryAWT $*
-#testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug694ScaleImageUnpackBufferSizeAWT $*
+testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug694ScaleImageUnpackBufferSizeAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug365TextureGenerateMipMaps $*
 #testawt com.jogamp.opengl.test.junit.jogl.awt.TestGLCanvasAWTActionDeadlock00AWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.awt.TestGLCanvasAWTActionDeadlock01AWT $*