eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing buffer object streaming

Browse Source
This commit is contained in:
codeanticode
2021-06-19 08:29:56 -04:00
parent 5e0776161e
commit a23aaa5198
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PGraphicsOpenGL.java
+16 -3
View File
@@ -9234,7 +9234,12 @@ public class PGraphicsOpenGL extends PGraphics {
pointOffsets = new float[2 * PGL.DEFAULT_TESS_VERTICES];
pointIndices = new short[PGL.DEFAULT_TESS_VERTICES];
polyVerticesBuffer = PGL.allocateFloatBuffer(polyVertices);
// STREAM TEST 3 - BEGIN
if (renderMode == IMMEDIATE)
polyVerticesBuffer = PGL.allocateFloatBuffer(polyVertices);
// STREAM TEST 3 - END
polyColorsBuffer = PGL.allocateIntBuffer(polyColors);
polyNormalsBuffer = PGL.allocateFloatBuffer(polyNormals);
polyTexCoordsBuffer = PGL.allocateFloatBuffer(polyTexCoords);
@@ -9683,7 +9688,11 @@ public class PGraphicsOpenGL extends PGraphics {
float[] temp = new float[4 * n];
PApplet.arrayCopy(polyVertices, 0, temp, 0, 4 * polyVertexCount);
polyVertices = temp;
polyVerticesBuffer = PGL.allocateFloatBuffer(polyVertices);
// STREAM TEST 4 - BEGIN
if (renderMode == IMMEDIATE)
polyVerticesBuffer = PGL.allocateFloatBuffer(polyVertices);
// STREAM TEST 4 - END
}
void expandPolyColors(int n) {
@@ -9881,7 +9890,11 @@ public class PGraphicsOpenGL extends PGraphics {
float[] temp = new float[4 * polyVertexCount];
PApplet.arrayCopy(polyVertices, 0, temp, 0, 4 * polyVertexCount);
polyVertices = temp;
polyVerticesBuffer = PGL.allocateFloatBuffer(polyVertices);
// STREAM TEST 5 - BEGIN
if (renderMode == IMMEDIATE)
polyVerticesBuffer = PGL.allocateFloatBuffer(polyVertices);
// STREAM TEST 5 - BEGIN
}
void trimPolyColors() {
core/src/processing/opengl/PShapeOpenGL.java
+21 -5
View File
@@ -41,6 +41,7 @@ import processing.opengl.PGraphicsOpenGL.Tessellator;
import processing.opengl.PGraphicsOpenGL.VertexAttribute;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.HashSet;
@@ -3923,12 +3924,18 @@ public class PShapeOpenGL extends PShape {
int sizef = size * PGL.SIZEOF_FLOAT;
int sizei = size * PGL.SIZEOF_INT;
tessGeo.updatePolyVerticesBuffer();
// STREAM TEST 1 - BEGIN
PApplet.println("Stream buffer");
if (bufPolyVertex == null)
bufPolyVertex = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 4, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyVertex.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, 4 * sizef,
tessGeo.polyVerticesBuffer, glUsage);
pgl.bufferData(PGL.ARRAY_BUFFER, 4 * sizef, null, glUsage);
ByteBuffer buffer = pgl.mapBuffer(PGL.ARRAY_BUFFER, PGL.WRITE_ONLY);
tessGeo.polyVerticesBuffer = buffer.asFloatBuffer();
tessGeo.updatePolyVerticesBuffer();
pgl.unmapBuffer(PGL.ARRAY_BUFFER);
// STREAM TEST 1 - END
tessGeo.updatePolyColorsBuffer();
if (bufPolyColor == null)
@@ -4129,12 +4136,22 @@ public class PShapeOpenGL extends PShape {
protected void updateGeometryImpl() {
if (modifiedPolyVertices) {
// STREAM TEST 2 - BEGIN
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyVertex.glId);
ByteBuffer buffer = pgl.mapBuffer(PGL.ARRAY_BUFFER, PGL.WRITE_ONLY);
tessGeo.polyVerticesBuffer = buffer.asFloatBuffer();
int offset = firstModifiedPolyVertex;
int size = lastModifiedPolyVertex - offset + 1;
copyPolyVertices(offset, size);
tessGeo.updatePolyVerticesBuffer(offset, size);
modifiedPolyVertices = false;
firstModifiedPolyVertex = PConstants.MAX_INT;
lastModifiedPolyVertex = PConstants.MIN_INT;
pgl.unmapBuffer(PGL.ARRAY_BUFFER);
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
// STREAM TEST 2 - END
}
if (modifiedPolyColors) {
int offset = firstModifiedPolyColor;
@@ -4259,7 +4276,6 @@ public class PShapeOpenGL extends PShape {
protected void copyPolyVertices(int offset, int size) {
tessGeo.updatePolyVerticesBuffer(offset, size);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyVertex.glId);
tessGeo.polyVerticesBuffer.position(4 * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, 4 * offset * PGL.SIZEOF_FLOAT,