From f3afd3cd3be302c9b9cc3b6ec56cf032817e00a4 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 26 Apr 2011 19:24:19 +0200 Subject: sync w/ jogl e007bb306124411e0232e51d16aa493cbd361f74 --- src/demos/texture/TestSubImage.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/demos/texture/TestSubImage.java') diff --git a/src/demos/texture/TestSubImage.java b/src/demos/texture/TestSubImage.java index 377a910..05cbb59 100755 --- a/src/demos/texture/TestSubImage.java +++ b/src/demos/texture/TestSubImage.java @@ -120,7 +120,7 @@ public class TestSubImage { if (convertedImage == null) { // Get rid of any previously allocated texture if (texture != null) { - texture.dispose(); + texture.destroy(gl); texture = null; } @@ -183,15 +183,15 @@ public class TestSubImage { yOrigin = texture.getHeight() - yOrigin; } - texture.updateSubImage(textureData, 0, + texture.updateSubImage(gl, textureData, 0, union.x, yOrigin, union.x, yOrigin, union.width, union.height); } // Now draw one quad with the texture - texture.enable(); - texture.bind(); + texture.enable(gl); + texture.bind(gl); gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_REPLACE); TextureCoords coords = texture.getImageTexCoords(); gl.glBegin(GL2.GL_QUADS); @@ -204,7 +204,7 @@ public class TestSubImage { gl.glTexCoord2f(coords.left(), coords.top()); gl.glVertex3f(0, 1, 0); gl.glEnd(); - texture.disable(); + texture.disable(gl); } public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) {} -- cgit v1.2.3