diff options
Diffstat (limited to 'src/test/com/jogamp')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestRandomTiledRendering2GL2.java b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestRandomTiledRendering2GL2.java index 1d917efb9..d1fabfa6b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestRandomTiledRendering2GL2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestRandomTiledRendering2GL2.java @@ -90,7 +90,7 @@ public class TestRandomTiledRendering2GL2 extends UITestCase { gl.glMatrixMode(GL2.GL_MODELVIEW); } }; - renderer.attachAutoDrawable(glad, pmvMatrixCallback); + renderer.attachToAutoDrawable(glad, pmvMatrixCallback); renderer.setImageSize(imageWidth, imageHeight); final GLPixelBuffer.GLPixelBufferProvider pixelBufferProvider = GLPixelBuffer.defaultProviderWithRowStride; @@ -101,9 +101,7 @@ public class TestRandomTiledRendering2GL2 extends UITestCase { public void init(GLAutoDrawable drawable) { final GL gl = drawable.getGL(); GLPixelAttributes pixelAttribs = pixelBufferProvider.getAttributes(gl, 3); - System.err.println("XXX: "+pixelAttribs+", gl2gl3 "+gl.isGL2GL3()+", "+gl.getContext().getGLVersion()); GLPixelBuffer pixelBuffer = pixelBufferProvider.allocate(gl, pixelAttribs, imageWidth, imageHeight, 1, true, 0); - System.err.println("XXX: "+pixelBuffer); renderer.setImageBuffer(pixelBuffer); if( drawable.isGLOriented() ) { flipVertically[0] = false; @@ -131,7 +129,7 @@ public class TestRandomTiledRendering2GL2 extends UITestCase { } } - renderer.detachAutoDrawable(); + renderer.detachFromAutoDrawable(); glad.destroy(); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledRendering1GL2.java b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledRendering1GL2.java index 7b1272993..5b628091b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledRendering1GL2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledRendering1GL2.java @@ -52,7 +52,7 @@ public class TestTiledRendering1GL2 extends UITestCase { // Initialize the tile rendering library final TileRenderer renderer = new com.jogamp.opengl.util.TileRenderer(); final TileRenderer.PMVMatrixCallback pmvMatrixCallback = new TileRenderer.PMVMatrixCallback() { - public void reshapePMVMatrix(GL _gl, int tileNum, int tileColumn, int tileRow, int tileX, int tileY, int tileWidth, int tileHeight, int imageWidth, int imageHeight) { + public void reshapePMVMatrix(GL _gl, int tileX, int tileY, int tileWidth, int tileHeight, int imageWidth, int imageHeight) { final GL2 gl = _gl.getGL2(); gl.glMatrixMode( GL2.GL_PROJECTION ); gl.glLoadIdentity(); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledRendering2GL2.java b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledRendering2GL2.java index 27198b149..d750ca853 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledRendering2GL2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/tile/TestTiledRendering2GL2.java @@ -55,7 +55,7 @@ public class TestTiledRendering2GL2 extends UITestCase { // Initialize the tile rendering library final TileRenderer renderer = new TileRenderer(); final TileRenderer.PMVMatrixCallback pmvMatrixCallback = new TileRenderer.PMVMatrixCallback() { - public void reshapePMVMatrix(GL _gl, int tileNum, int tileColumn, int tileRow, int tileX, int tileY, int tileWidth, int tileHeight, int imageWidth, int imageHeight) { + public void reshapePMVMatrix(GL _gl, int tileX, int tileY, int tileWidth, int tileHeight, int imageWidth, int imageHeight) { final GL2 gl = _gl.getGL2(); gl.glMatrixMode( GL2.GL_PROJECTION ); gl.glLoadIdentity(); @@ -91,7 +91,7 @@ public class TestTiledRendering2GL2 extends UITestCase { } }; - renderer.attachAutoDrawable(glad, 0, pmvMatrixCallback); + renderer.attachToAutoDrawable(glad, pmvMatrixCallback); renderer.setImageSize(imageWidth, imageHeight); final GLPixelBuffer.GLPixelBufferProvider pixelBufferProvider = GLPixelBuffer.defaultProviderWithRowStride; @@ -119,9 +119,11 @@ public class TestTiledRendering2GL2 extends UITestCase { }; renderer.setGLEventListener(preTileGLEL, null); - while ( renderer.display() ); + do { + renderer.display(); + } while ( !renderer.eot() ); - renderer.detachAutoDrawable(); + renderer.detachFromAutoDrawable(); glad.destroy(); |