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/TestTexture.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/demos/texture/TestTexture.java') diff --git a/src/demos/texture/TestTexture.java b/src/demos/texture/TestTexture.java index 057e957..224c247 100755 --- a/src/demos/texture/TestTexture.java +++ b/src/demos/texture/TestTexture.java @@ -184,7 +184,7 @@ public class TestTexture implements GLEventListener { if (flushTexture) { flushTexture = false; if (texture != null) { - texture.dispose(); + texture.destroy(gl); texture = null; } } @@ -193,7 +193,7 @@ public class TestTexture implements GLEventListener { newTexture = false; if (texture != null) { - texture.dispose(); + texture.destroy(gl); texture = null; } @@ -214,8 +214,8 @@ public class TestTexture implements GLEventListener { } if (texture != null) { - texture.enable(); - texture.bind(); + texture.enable(gl); + texture.bind(gl); gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL.GL_REPLACE); TextureCoords coords = texture.getImageTexCoords(); @@ -229,7 +229,7 @@ public class TestTexture implements GLEventListener { gl.glTexCoord2f(coords.left(), coords.top()); gl.glVertex3f(0, 1, 0); gl.glEnd(); - texture.disable(); + texture.disable(gl); } } -- cgit v1.2.3