sync w/ jogl e007bb306124411e0232e51d16aa493cbd361f74

2 files changed, 5 insertions, 5 deletions

diff --git a/src/demos/util/Cubemap.java b/src/demos/util/Cubemap.java
index 9f31b9a..5ceab82 100755
--- a/src/demos/util/Cubemap.java
+++ b/src/demos/util/Cubemap.java
@@ -62,10 +62,10 @@ public class Cubemap {
                                          GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
                                          GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z };
 
-  public static Texture loadFromStreams(ClassLoader scope,
+  public static Texture loadFromStreams(GL gl,
+                                        ClassLoader scope,
                                         String basename,
-                                        String suffix,
-                                        boolean mipmapped) throws IOException, GLException {
+                                        String suffix, boolean mipmapped) throws IOException, GLException {
     Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
 
     for (int i = 0; i < suffixes.length; i++) {
@@ -76,7 +76,7 @@ public class Cubemap {
       if (data == null) {
         throw new IOException("Unable to load texture " + resourceName);
       }
-      cubemap.updateImage(data, targets[i]);
+      cubemap.updateImage(gl, data, targets[i]);
     }
 
     return cubemap;
diff --git a/src/demos/util/DurationTimer.java b/src/demos/util/DurationTimer.java
index c0f88e7..18a7f40 100644
--- a/src/demos/util/DurationTimer.java
+++ b/src/demos/util/DurationTimer.java
@@ -58,7 +58,7 @@ public class DurationTimer {
     accumulatedTime += (curTime - startTime);
   }
 
-  public long getDuration() {
+  public long getTotalFPSDuration() {
     return accumulatedTime;
   }