diff options
| author | Sven Gothel <[email protected]> | 2012-10-31 21:32:28 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-31 21:32:28 +0100 |
| commit | 875a36a142b086e4f1c311440db008f816258de5 (patch) | |
| tree | 0173b5added3753d7e6acdad93a3c3b46d4f15bb /src/test/com | |
| parent | 1cd40d8284f2f8d0da9b40c4ea714a20aad97094 (diff) | |
MacOSXCGLContext: Fix ShaderCode instantiation .. (duh!) ; Tested via reparenting TestParentingFocusTraversal01AWT
Diffstat (limited to 'src/test/com')
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java | 4 | ||||
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java index f7881615d..15393e8ea 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/NewtAWTReparentingKeyAdapter.java @@ -48,7 +48,9 @@ public class NewtAWTReparentingKeyAdapter extends KeyAdapter { } public void keyTyped(KeyEvent e) { - if(e.getKeyChar()=='d') { + if(e.getKeyChar()=='i') { + System.err.println(glWindow); + } else if(e.getKeyChar()=='d') { glWindow.setUndecorated(!glWindow.isUndecorated()); } else if(e.getKeyChar()=='f') { glWindow.setFullscreen(!glWindow.isFullscreen()); diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java index f39b5df3b..d6f1f817a 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java @@ -68,12 +68,13 @@ public class TestParentingFocusTraversal01AWT extends UITestCase { static long durationPerTest = numFocus * 200; static GLCapabilities glCaps; static boolean manual = false; + static boolean forceGL3 = false; @BeforeClass public static void initClass() { glSize = new Dimension(200,200); fSize = new Dimension(300,300); - glCaps = new GLCapabilities(null); + glCaps = new GLCapabilities( forceGL3 ? GLProfile.get(GLProfile.GL3) : null ); } @Test @@ -314,6 +315,8 @@ public class TestParentingFocusTraversal01AWT extends UITestCase { durationPerTest = atoi(args[++i]); } else if(args[i].equals("-manual")) { manual = true; + } else if(args[i].equals("-gl3")) { + forceGL3 = true; } } String tstname = TestParentingFocusTraversal01AWT.class.getName(); |