BufferUtil:

    - new GL type tools
    - new put methods

ImmModeSink:
    - using 1 VBO array for 1-4 attributes

GLArrayData
    - split into GLArrayData and GLArrayDataEditable,
      the latter of modifying purposes only

    - GLArrayDataWrapper implements a container only


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1764 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 14 insertions, 8 deletions

diff --git a/make/gl-impl-CustomJavaCode-gles2.java b/make/gl-impl-CustomJavaCode-gles2.java
index 016dd0b9a..33caa19b0 100755
--- a/make/gl-impl-CustomJavaCode-gles2.java
+++ b/make/gl-impl-CustomJavaCode-gles2.java
@@ -597,14 +597,15 @@ public void glVertexPointer(GLArrayData array) {
   fixedFunction.glVertexPointer(this, array);
 }
 public void glVertexPointer(int size, int type, int stride, java.nio.Buffer pointer) {
-  glVertexPointer(GLArrayDataClient.createFixed(GL.GL_VERTEX_ARRAY, null, size, type, false, stride, pointer));
+  glVertexPointer(GLArrayDataWrapper.createFixed(GL.GL_VERTEX_ARRAY, size, type, false, stride, pointer, 0, 0));
 }
 public void glVertexPointer(int size, int type, int stride, long pointer_buffer_offset) {
   int vboName = bufferStateTracker.getBoundBufferObject(GL.GL_ARRAY_BUFFER, this);
   if(vboName==0) {
     throw new GLException("no GL_ARRAY_BUFFER VBO bound");
   }
-  glVertexPointer(GLArrayDataServer.createFixed(GL.GL_VERTEX_ARRAY, null, size, type, false, stride, pointer_buffer_offset, vboName));
+  glVertexPointer(GLArrayDataWrapper.createFixed(GL.GL_VERTEX_ARRAY, size, type, false, 
+                                                 stride, null, vboName, pointer_buffer_offset));
 }
 
 public void glColorPointer(GLArrayData array) {
@@ -622,14 +623,16 @@ public void glColorPointer(GLArrayData array) {
   fixedFunction.glColorPointer(this, array);
 }
 public void glColorPointer(int size, int type, int stride, java.nio.Buffer pointer) {
-  glColorPointer(GLArrayDataClient.createFixed(GL.GL_COLOR_ARRAY, null, size, type, false, stride, pointer));
+  glColorPointer(GLArrayDataWrapper.createFixed(GL.GL_COLOR_ARRAY, size, type, false, 
+                                                stride, pointer, 0, 0));
 }
 public void glColorPointer(int size, int type, int stride, long pointer_buffer_offset) {
   int vboName = bufferStateTracker.getBoundBufferObject(GL.GL_ARRAY_BUFFER, this);
   if(vboName==0) {
     throw new GLException("no GL_ARRAY_BUFFER VBO bound");
   }
-  glColorPointer(GLArrayDataServer.createFixed(GL.GL_COLOR_ARRAY, null, size, type, false, stride, pointer_buffer_offset, vboName));
+  glColorPointer(GLArrayDataWrapper.createFixed(GL.GL_COLOR_ARRAY, size, type, false, 
+                                               stride, null, vboName, pointer_buffer_offset));
 }
 
 public void glNormalPointer(GLArrayData array) {
@@ -650,14 +653,16 @@ public void glNormalPointer(GLArrayData array) {
   fixedFunction.glNormalPointer(this, array);
 }
 public void glNormalPointer(int type, int stride, java.nio.Buffer pointer) {
-  glNormalPointer(GLArrayDataClient.createFixed(GL.GL_NORMAL_ARRAY, null, 3, type, false, stride, pointer));
+  glNormalPointer(GLArrayDataWrapper.createFixed(GL.GL_NORMAL_ARRAY, 3, type, false, 
+                                                 stride, pointer, 0, 0));
 }
 public void glNormalPointer(int type, int stride, long pointer_buffer_offset) {
   int vboName = bufferStateTracker.getBoundBufferObject(GL.GL_ARRAY_BUFFER, this);
   if(vboName==0) {
     throw new GLException("no GL_ARRAY_BUFFER VBO bound");
   }
-  glNormalPointer(GLArrayDataServer.createFixed(GL.GL_NORMAL_ARRAY, null, 3, type, false, stride, pointer_buffer_offset, vboName));
+  glNormalPointer(GLArrayDataWrapper.createFixed(GL.GL_NORMAL_ARRAY, 3, type, false, 
+                                                 stride, null, vboName, pointer_buffer_offset));
 }
 
 public void glTexCoordPointer(GLArrayData array) {
@@ -676,7 +681,7 @@ public void glTexCoordPointer(GLArrayData array) {
 }
 public void glTexCoordPointer(int size, int type, int stride, java.nio.Buffer pointer) {
   glTexCoordPointer(
-    GLArrayDataClient.createFixed(GL.GL_TEXTURE_COORD_ARRAY, null, size, type, false, stride, pointer));
+    GLArrayDataWrapper.createFixed(GL.GL_TEXTURE_COORD_ARRAY, size, type, false, stride, pointer, 0,0));
 }
 public void glTexCoordPointer(int size, int type, int stride, long pointer_buffer_offset) {
   int vboName = bufferStateTracker.getBoundBufferObject(GL.GL_ARRAY_BUFFER, this);
@@ -684,6 +689,7 @@ public void glTexCoordPointer(int size, int type, int stride, long pointer_buffe
     throw new GLException("no GL_ARRAY_BUFFER VBO bound");
   }
   glTexCoordPointer(
-    GLArrayDataServer.createFixed(GL.GL_TEXTURE_COORD_ARRAY, null, size, type, false, stride, pointer_buffer_offset, vboName) );
+    GLArrayDataWrapper.createFixed(GL.GL_TEXTURE_COORD_ARRAY, size, type, false, 
+                                   stride, null, vboName, pointer_buffer_offset) );
 }