summaryrefslogtreecommitdiffstats
path: root/make/config
diff options
context:
space:
mode:
Diffstat (limited to 'make/config')
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java6
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java26
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gles1.java26
3 files changed, 29 insertions, 29 deletions
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
index 82b791208..8cd253a41 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
@@ -1,11 +1,11 @@
@Override
public final void glVertexAttribPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
+ if(array.getCompsPerElem()==0) return;
if(array.isVBO()) {
- glVertexAttribPointer(array.getLocation(), array.getComponentCount(), array.getComponentType(),
+ glVertexAttribPointer(array.getLocation(), array.getCompsPerElem(), array.getCompType(),
array.getNormalized(), array.getStride(), array.getVBOOffset());
} else {
- glVertexAttribPointer(array.getLocation(), array.getComponentCount(), array.getComponentType(),
+ glVertexAttribPointer(array.getLocation(), array.getCompsPerElem(), array.getCompType(),
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 0db1b4a6e..5fb2bc2e8 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -426,42 +426,42 @@ public final boolean isPBOUnpackBound() {
@Override
public final void glVertexPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
+ if(array.getCompsPerElem()==0) return;
if(array.isVBO()) {
- glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glVertexPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getVBOOffset());
} else {
- glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glVertexPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getBuffer());
}
}
@Override
public final void glColorPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
+ if(array.getCompsPerElem()==0) return;
if(array.isVBO()) {
- glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glColorPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getVBOOffset());
} else {
- glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glColorPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getBuffer());
}
}
@Override
public final void glNormalPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
- if(array.getComponentCount()!=3) {
+ if(array.getCompsPerElem()==0) return;
+ if(array.getCompsPerElem()!=3) {
throw new GLException("Only 3 components per normal allowed");
}
if(array.isVBO()) {
- glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glNormalPointer(array.getCompType(), array.getStride(), array.getVBOOffset());
} else {
- glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
+ glNormalPointer(array.getCompType(), array.getStride(), array.getBuffer());
}
}
@Override
public final void glTexCoordPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
+ if(array.getCompsPerElem()==0) return;
if(array.isVBO()) {
- glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glTexCoordPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getVBOOffset());
} else {
- glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glTexCoordPointer(array.getCompsPerElem(), array.getCompType(), 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 c9dafc419..964156473 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -280,42 +280,42 @@ private final boolean checkPackPBOBound(boolean throwException) {
@Override
public final void glVertexPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
+ if(array.getCompsPerElem()==0) return;
if(array.isVBO()) {
- glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glVertexPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getVBOOffset());
} else {
- glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glVertexPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getBuffer());
}
}
@Override
public final void glColorPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
+ if(array.getCompsPerElem()==0) return;
if(array.isVBO()) {
- glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glColorPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getVBOOffset());
} else {
- glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glColorPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getBuffer());
}
}
@Override
public final void glNormalPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
- if(array.getComponentCount()!=3) {
+ if(array.getCompsPerElem()==0) return;
+ if(array.getCompsPerElem()!=3) {
throw new GLException("Only 3 components per normal allowed");
}
if(array.isVBO()) {
- glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glNormalPointer(array.getCompType(), array.getStride(), array.getVBOOffset());
} else {
- glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
+ glNormalPointer(array.getCompType(), array.getStride(), array.getBuffer());
}
}
@Override
public final void glTexCoordPointer(GLArrayData array) {
- if(array.getComponentCount()==0) return;
+ if(array.getCompsPerElem()==0) return;
if(array.isVBO()) {
- glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glTexCoordPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getVBOOffset());
} else {
- glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glTexCoordPointer(array.getCompsPerElem(), array.getCompType(), array.getStride(), array.getBuffer());
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 09:50:43 +0000