summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-03-11 20:42:09 +0100
committerSven Gothel <[email protected]>2015-03-11 20:42:09 +0100
commit99f14475993d127f1b927056b309477753563a02 (patch)
treebf9ca7c45e6735d8ffefadb7698a3b2d7e80ebd6 /src
parenta622ffbced14e1e2fe797c82fc62c431ffb6949f (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java15
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java1
2 files changed, 3 insertions, 13 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java
index ff5eb6484..61d32f12f 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java
@@ -32,7 +32,7 @@ import com.jogamp.opengl.GLProfile;
import com.jogamp.opengl.GLCapabilities;
import com.jogamp.opengl.awt.GLCanvas;
import com.jogamp.opengl.util.Animator;
-
+import com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT3;
import com.jogamp.opengl.test.junit.util.UITestCase;
import java.awt.Frame;
@@ -156,17 +156,6 @@ public class TestAWTTextRendererUseVertexArrayBug464 extends UITestCase {
}
public static void main(final String args[]) throws IOException {
- final String tstname = TestAWTTextRendererUseVertexArrayBug464.class.getName();
- org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] {
- tstname,
- "filtertrace=true",
- "haltOnError=false",
- "haltOnFailure=false",
- "showoutput=true",
- "outputtoformatters=true",
- "logfailedtests=true",
- "logtestlistenerevents=true",
- "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter",
- "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } );
+ org.junit.runner.JUnitCore.main(TestAWTTextRendererUseVertexArrayBug464.class.getName());
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java
index 4556a6806..c0e6e05d2 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java
@@ -67,6 +67,7 @@ public class TestBug694ScaleImageUnpackBufferSizeAWT extends UITestCase implemen
final GL gl = drawable.getGL();
final GLU glu = GLU.createGLU(gl);
+ System.err.println("Using GLU "+glu.getClass().getName());
testGLUScaleImage(gl, glu, 0); // default 4
testGLUScaleImage(gl, glu, 1);
testGLUScaleImage(gl, glu, 4);