aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-10-31 00:57:14 +0100
committerSven Gothel <[email protected]>2013-10-31 00:57:14 +0100
commit17706bd9dee80f5dd2fccdc19e7c246cb3881a98 (patch)
tree055f91ff409fee542e6347667b708ee66f67ff0d
parentd2690939b46a91b346bdd2d4ce750ddb0d2136fd (diff)
TestSharedContextVBOES2NEWT1: Fix copy/paste (mistakenly used sharedGears), add println; GearsES: Add init/shared state to 'toString()'
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT1.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT1.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT1.java
index 3cd26028b..928b03703 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT1.java
@@ -119,6 +119,7 @@ public class TestSharedContextVBOES2NEWT1 extends UITestCase {
Assert.assertTrue("Master ctx not created", AWTRobotUtil.waitForContextCreated(sharedDrawable, true));
Assert.assertTrue("Master Ctx is shared before shared creation", !ctxM.isShared());
Assert.assertTrue("Master Gears not initialized", sharedGears.waitForInit(true));
+ System.err.println("Master Gears Init done: "+sharedGears);
Assert.assertTrue("Master Gears is shared", !sharedGears.usesSharedGears());
}
@@ -161,7 +162,8 @@ public class TestSharedContextVBOES2NEWT1 extends UITestCase {
}
Assert.assertEquals("New Context not shared as expected", useShared, glWindow.getContext().isShared());
- Assert.assertTrue("Gears not initialized", sharedGears.waitForInit(true));
+ Assert.assertTrue("Gears not initialized", gears.waitForInit(true));
+ System.err.println("Slave Gears Init done: "+gears);
Assert.assertEquals("Gears is not shared as expected", useShared, gears.usesSharedGears());
return glWindow;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
index be7fcee07..3d7db0465 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
@@ -306,8 +306,8 @@ public class GearsES2 implements GLEventListener, TileRendererBase.TileRendererL
gl.glFinish(); // make sure .. for shared context (impacts OSX 10.9)
- System.err.println(Thread.currentThread()+" GearsES2.init "+sid()+" FIN "+this);
isInit = true;
+ System.err.println(Thread.currentThread()+" GearsES2.init "+sid()+" FIN "+this);
}
public final boolean isInit() { return isInit; }
@@ -497,7 +497,7 @@ public class GearsES2 implements GLEventListener, TileRendererBase.TileRendererL
@Override
public String toString() {
- return "GearsES2[obj "+sid()+" 1 "+gear1+", 2 "+gear2+", 3 "+gear3+"]";
+ return "GearsES2[obj "+sid()+" isInit "+isInit+", usesShared "+usesSharedGears+", 1 "+gear1+", 2 "+gear2+", 3 "+gear3+"]";
}
boolean confinedFixedCenter = false;