Merge: merged with sgothel

3 files changed, 9 insertions, 9 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
index d99f46ec1..bc2af092b 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
@@ -2,7 +2,7 @@
     if(array.getComponentNumber()==0) return;
     if(array.isVBO()) {
         glVertexAttribPointer(array.getLocation(), array.getComponentNumber(), array.getComponentType(), 
-                              array.getNormalized(), array.getStride(), array.getOffset());
+                              array.getNormalized(), array.getStride(), array.getVBOOffset());
     } else {
         glVertexAttribPointer(array.getLocation(), array.getComponentNumber(), array.getComponentType(), 
                               array.getNormalized(), array.getStride(), array.getBuffer());
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index 6776feeb7..dbfa3ef4d 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -358,7 +358,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
     public void glVertexPointer(GLArrayData array) {
       if(array.getComponentNumber()==0) return;
       if(array.isVBO()) {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
       } else {
           glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
       }
@@ -366,7 +366,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
     public void glColorPointer(GLArrayData array) {
       if(array.getComponentNumber()==0) return;
       if(array.isVBO()) {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
       } else {
           glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
       }
@@ -378,7 +378,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
         throw new GLException("Only 3 components per normal allowed");
       }
       if(array.isVBO()) {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
       } else {
           glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
       }
@@ -386,7 +386,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
     public void glTexCoordPointer(GLArrayData array) {
       if(array.getComponentNumber()==0) return;
       if(array.isVBO()) {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
       } else {
           glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
       }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index faff8b89f..0a0f87897 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -295,7 +295,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
 public void glVertexPointer(GLArrayData array) {
   if(array.getComponentNumber()==0) return;
   if(array.isVBO()) {
-      glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
   } else {
       glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
   }
@@ -303,7 +303,7 @@ public void glVertexPointer(GLArrayData array) {
 public void glColorPointer(GLArrayData array) {
   if(array.getComponentNumber()==0) return;
   if(array.isVBO()) {
-      glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
   } else {
       glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
   }
@@ -315,7 +315,7 @@ public void glNormalPointer(GLArrayData array) {
     throw new GLException("Only 3 components per normal allowed");
   }
   if(array.isVBO()) {
-      glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+      glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
   } else {
       glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
   }
@@ -323,7 +323,7 @@ public void glNormalPointer(GLArrayData array) {
 public void glTexCoordPointer(GLArrayData array) {
   if(array.getComponentNumber()==0) return;
   if(array.isVBO()) {
-      glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+      glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
   } else {
       glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
   }