summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-08-23 00:39:30 +0200
committerSven Gothel <[email protected]>2013-08-23 00:39:30 +0200
commit4dc4a32720e7b176e6811c0eaa8ddc060e1468da (patch)
treef52ea9bbd1c037f044d219e43c3f0fc4012b8171 /src/test
parentc6555b09c455d0db238e4cf57ee3efd4e426f215 (diff)
TextureSequence: Add END_OF_STREAM_PTS, remove 'blocking' from getNextTexture(..), may blocks .. or not, depending on implementation and state.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/TextureSequenceDemo01.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/TextureSequenceDemo01.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/TextureSequenceDemo01.java
index 6fd47e63f..ab3899a7b 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/TextureSequenceDemo01.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/TextureSequenceDemo01.java
@@ -77,7 +77,7 @@ public class TextureSequenceDemo01 implements TextureSequence {
}
@Override
- public TextureSequence.TextureFrame getNextTexture(GL gl, boolean blocking) throws IllegalStateException {
+ public TextureSequence.TextureFrame getNextTexture(GL gl) throws IllegalStateException {
return frame;
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
index 556d17992..4172a2c20 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureSequenceCubeES2.java
@@ -370,7 +370,7 @@ public class TextureSequenceCubeES2 implements GLEventListener {
interleavedVBO.enableBuffer(gl, true);
Texture tex = null;
if(null!=texSeq) {
- final TextureSequence.TextureFrame texFrame = texSeq.getNextTexture(gl, true);
+ final TextureSequence.TextureFrame texFrame = texSeq.getNextTexture(gl);
if(null != texFrame) {
tex = texFrame.getTexture();
gl.glActiveTexture(GL.GL_TEXTURE0+texSeq.getTextureUnit());