Cleanup GLArrayData*, misc stuff

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

4 files changed, 19 insertions, 1 deletions

diff --git a/make/build.xml b/make/build.xml
index 92e4188a8..9b7f41eb6 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -770,6 +770,17 @@
         </gluegen>
     </target>
 
+    <target name="java.generate.SystemUtil.javame_cdc_fp" if="jogl.cdcfp">
+        <copy file="../src/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="../build/gensrc/classes/com/sun/opengl/impl/SystemUtil.java" />
+    </target>
+
+    <target name="java.generate.SystemUtil.javase" unless="jogl.cdcfp">
+        <copy file="../src/classes/com/sun/opengl/impl/SystemUtil.java.javase" tofile="../build/gensrc/classes/com/sun/opengl/impl/SystemUtil.java" />
+    </target>
+
+    <!-- Generate the SystemUtil class for this particular profile -->
+    <target name="java.generate.SystemUtil" depends="java.generate.SystemUtil.javase, java.generate.SystemUtil.javame_cdc_fp" />
+
     <target name="java.generate.BufferUtil.javame_cdc_fp" if="jogl.cdcfp">
         <copy file="../src/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="../build/gensrc/classes/javax/media/opengl/util/BufferUtil.java" />
     </target>
@@ -810,7 +821,7 @@
        - from the C GL headers.  This involves setting the taskdef and creating
        - the classpath reference id then running the task on each header.
       -->
-    <target name="java.generate" depends="build.gluegen, java.generate.BufferUtil, java.generate.TextureIO, java.generate.check" unless="java.generate.skip">
+    <target name="java.generate" depends="build.gluegen, java.generate.SystemUtil, java.generate.BufferUtil, java.generate.TextureIO, java.generate.check" unless="java.generate.skip">
 
         <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
         <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
diff --git a/make/gl-if-CustomJavaCode-gl.java b/make/gl-if-CustomJavaCode-gl.java
index 20cfe864c..acb3f10f5 100644
--- a/make/gl-if-CustomJavaCode-gl.java
+++ b/make/gl-if-CustomJavaCode-gl.java
@@ -121,3 +121,4 @@
 
   public void glShadeModel(int mode);
 
+  public int glGetBoundBuffer(int target);
diff --git a/make/gl-impl-CustomJavaCode-common.java b/make/gl-impl-CustomJavaCode-common.java
index 866fbc7ae..930f976ce 100644
--- a/make/gl-impl-CustomJavaCode-common.java
+++ b/make/gl-impl-CustomJavaCode-common.java
@@ -18,3 +18,7 @@
     return false;
   }
 
+  public int glGetBoundBuffer(int target) {
+    return bufferStateTracker.getBoundBufferObject(target, this);
+  }
+
diff --git a/make/gl-impl-CustomJavaCode-gl2es12.java b/make/gl-impl-CustomJavaCode-gl2es12.java
index 643443b91..0eff40f08 100644
--- a/make/gl-impl-CustomJavaCode-gl2es12.java
+++ b/make/gl-impl-CustomJavaCode-gl2es12.java
@@ -430,3 +430,5 @@ native private long dispatch_glMapBuffer(int target, int access, long glProcAddr
           glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
       }
     }
+
+