API Change GLArrayDataWrapper/GLArrayDataServer: Add vboTarget to wrapper cstr and add interleaved seg.

vboTarget is required in case of interleaved segments to allow eg. interleaved indices.

3 files changed, 6 insertions, 6 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsObjectES1.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsObjectES1.java
index 0da2b5496..3d93edbaf 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsObjectES1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsObjectES1.java
@@ -44,8 +44,8 @@ public class GearsObjectES1 extends GearsObject {
     @Override
     public void addInterleavedVertexAndNormalArrays(GLArrayDataServer array,
             int components) {
-        array.addFixedSubArray(GLPointerFunc.GL_VERTEX_ARRAY, 3);
-        array.addFixedSubArray(GLPointerFunc.GL_NORMAL_ARRAY, 3);
+        array.addFixedSubArray(GLPointerFunc.GL_VERTEX_ARRAY, 3, GL.GL_ARRAY_BUFFER);
+        array.addFixedSubArray(GLPointerFunc.GL_NORMAL_ARRAY, 3, GL.GL_ARRAY_BUFFER);
     }
 
     private void draw(GL2ES1 gl, GLArrayDataServer array, int mode) {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java
index 660218e6f..9e9fd1379 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsObjectES2.java
@@ -59,8 +59,8 @@ public class GearsObjectES2 extends GearsObject {
     public void addInterleavedVertexAndNormalArrays(GLArrayDataServer array,
             int components) {
         final ShaderState st = ShaderState.getCurrentShaderState();
-        array.addGLSLSubArray(st, "vertices", 3);
-        array.addGLSLSubArray(st, "normals", 3);
+        array.addGLSLSubArray(st, "vertices", 3, GL.GL_ARRAY_BUFFER);
+        array.addGLSLSubArray(st, "normals", 3, GL.GL_ARRAY_BUFFER);
     }
 
     private void draw(GL2ES2 gl, GLArrayDataServer array, int mode) {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
index 544ec4af5..bcff745f7 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
@@ -78,7 +78,7 @@ public class RedSquareES2 implements GLEventListener {
         Assert.assertTrue(0 <= mgl_Vertex);
         Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError());
         FloatBuffer buffer = Buffers.newDirectFloatBuffer(numElements * components);
-        GLArrayDataWrapper vertices = GLArrayDataWrapper.createGLSL("mgl_Vertex", 3, gl.GL_FLOAT, false, 0, buffer, 0, 0, 0);
+        GLArrayDataWrapper vertices = GLArrayDataWrapper.createGLSL("mgl_Vertex", 3, gl.GL_FLOAT, false, 0, buffer, 0, 0, 0, GL.GL_ARRAY_BUFFER);
         {
             // Fill them up
             FloatBuffer verticeb = (FloatBuffer) vertices.getBuffer();
@@ -99,7 +99,7 @@ public class RedSquareES2 implements GLEventListener {
         Assert.assertTrue(0 <= mgl_Color);
         Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError());
         buffer = Buffers.newDirectFloatBuffer(numElements * components);
-        GLArrayDataWrapper colors = GLArrayDataWrapper.createGLSL("mgl_Color", 4, gl.GL_FLOAT, false, 0, buffer, 0, 0, 0);
+        GLArrayDataWrapper colors = GLArrayDataWrapper.createGLSL("mgl_Color", 4, gl.GL_FLOAT, false, 0, buffer, 0, 0, 0, GL.GL_ARRAY_BUFFER);
         {
             // Fill them up
             FloatBuffer colorb = (FloatBuffer) colors.getBuffer();