diff options
Diffstat (limited to 'src')
5 files changed, 8 insertions, 8 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java index 3f97cbc54..8684ab15e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java @@ -52,7 +52,7 @@ public class TestPBufferDeadlockAWT extends UITestCase { @BeforeClass public static void initClass() { - glp = GLProfile.getGL2ES2(); + glp = GLProfile.getMaxFixedFunc(true); Assert.assertNotNull( glp ); width = 512; height = 512; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGTextureFromFileNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGTextureFromFileNEWT.java index 82867f9e6..adce6245e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGTextureFromFileNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGTextureFromFileNEWT.java @@ -160,8 +160,8 @@ public class TestJPEGTextureFromFileNEWT extends UITestCase { public void testImpl(boolean useFFP, final InputStream istream) throws InterruptedException, IOException { final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false); GLProfile glp; - if(useFFP && GLProfile.isAvailable(GLProfile.GL2GL3)) { - glp = GLProfile.getGL2GL3(); + if(useFFP && GLProfile.isAvailable(GLProfile.GL2)) { + glp = GLProfile.getMaxFixedFunc(true); } else if(!useFFP && GLProfile.isAvailable(GLProfile.GL2ES2)) { glp = GLProfile.getGL2ES2(); } else { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java index 651eeb5f9..756a8d8e4 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java @@ -102,8 +102,8 @@ public class TestPNGTextureFromFileAWT extends UITestCase { { final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false); GLProfile glp; - if(useFFP && GLProfile.isAvailable(GLProfile.GL2GL3)) { - glp = GLProfile.getGL2GL3(); + if(useFFP && GLProfile.isAvailable(GLProfile.GL2)) { + glp = GLProfile.getMaxFixedFunc(true); } else if(!useFFP && GLProfile.isAvailable(GLProfile.GL2ES2)) { glp = GLProfile.getGL2ES2(); } else { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java index 773b839a2..42e5230da 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java @@ -150,8 +150,8 @@ public class TestPNGTextureFromFileNEWT extends UITestCase { public void testImpl(boolean useFFP, final InputStream istream) throws InterruptedException, IOException { final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false); GLProfile glp; - if(useFFP && GLProfile.isAvailable(GLProfile.GL2GL3)) { - glp = GLProfile.getGL2GL3(); + if(useFFP && GLProfile.isAvailable(GLProfile.GL2)) { + glp = GLProfile.getMaxFixedFunc(true); } else if(!useFFP && GLProfile.isAvailable(GLProfile.GL2ES2)) { glp = GLProfile.getGL2ES2(); } else { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture01AWT.java index c33384611..6913cf30e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture01AWT.java @@ -80,7 +80,7 @@ public class TestTexture01AWT extends UITestCase { UITestCase.setTestSupported(false); return; } - glp = GLProfile.getGL2GL3(); + glp = GLProfile.getMaxFixedFunc(true); Assert.assertNotNull(glp); caps = new GLCapabilities(glp); Assert.assertNotNull(caps); |