3 files changed, 12 insertions, 12 deletions

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) {}
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);
     }
   }
 
diff --git a/src/demos/texture/TextureConvert.java b/src/demos/texture/TextureConvert.java
index 7967416..cd198e0 100755
--- a/src/demos/texture/TextureConvert.java
+++ b/src/demos/texture/TextureConvert.java
@@ -39,7 +39,7 @@
 
 package demos.texture;
 
-import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.common.util.IOUtil;
 import com.jogamp.opengl.util.texture.Texture;
 import com.jogamp.opengl.util.texture.TextureData;
 import com.jogamp.opengl.util.texture.TextureIO;
@@ -84,7 +84,7 @@ public class TextureConvert {
     GL gl = pbuffer.getGL();
 
     boolean attemptCompression = false;
-    if (TextureIO.DDS.equals(FileUtil.getFileSuffix(outputFile))) {
+    if (TextureIO.DDS.equals(IOUtil.getFileSuffix(outputFile))) {
       if (gl.isExtensionAvailable("GL_EXT_texture_compression_s3tc") ||
           gl.isExtensionAvailable("GL_NV_texture_compression_vtc")) {
         attemptCompression = true;