diff options
author | Sven Gothel <[email protected]> | 2023-02-24 15:33:39 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2023-02-24 15:33:39 +0100 |
commit | 3d537d4239e3772ffdb33592e5e66844d94ac9f3 (patch) | |
tree | 191f5edc014e0da8d9aa1588ce875cbbc5397f1d /make/config | |
parent | d2d09d37be87bebf7700b9f82bccdf94a7ff5e51 (diff) |
GLArrayData*: Shorten methods (*API Change*), use proper constructor and finalize immutables, add growthFactor (default golden ratio 1.618), add getCapacity*() and printStats(..)
The growthFactor becomes essential for better growth behavior and can be set via setGrowthFactor().
The other changes were merely to clean up the GLArrayData interface and its 4 implementations.
Not great to change its API, but one name was misleading ['getComponentCount' -> 'getCompsPerEleme'],
so overall .. readability is enhanced.
Motivation for this change was the performance analysis and improvement of our Graph Curve Renderer.
Diffstat (limited to 'make/config')
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java | 6 | ||||
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 26 | ||||
-rw-r--r-- | make/config/jogl/gl-impl-CustomJavaCode-gles1.java | 26 |
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()); } } |