eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-12 10:00:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't delete any gl resources in dispose

Browse Source
This commit is contained in:
codeanticode
2014-04-03 11:59:41 -04:00
parent e06bbcf2fd
commit a9023be06a
1 changed files with 26 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
core/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -629,9 +629,9 @@ public class PGraphicsOpenGL extends PGraphics {
pgl.swapBuffers();
}
deletePolyBuffers();
deleteLineBuffers();
deletePointBuffers();
finalizePolyBuffers();
finalizeLineBuffers();
finalizePointBuffers();
deleteSurfaceTextures();
if (primarySurface) {
@@ -1378,76 +1378,53 @@ public class PGraphicsOpenGL extends PGraphics {
}
protected void deletePolyBuffers() {
if (polyBuffersCreated) {
deleteVertexBufferObject(glPolyVertex, polyBuffersContext, pgl);
glPolyVertex = 0;
deleteVertexBufferObject(glPolyColor, polyBuffersContext, pgl);
glPolyColor = 0;
deleteVertexBufferObject(glPolyNormal, polyBuffersContext, pgl);
glPolyNormal = 0;
deleteVertexBufferObject(glPolyTexcoord, polyBuffersContext, pgl);
glPolyTexcoord = 0;
deleteVertexBufferObject(glPolyAmbient, polyBuffersContext, pgl);
glPolyAmbient = 0;
deleteVertexBufferObject(glPolySpecular, polyBuffersContext, pgl);
glPolySpecular = 0;
deleteVertexBufferObject(glPolyEmissive, polyBuffersContext, pgl);
glPolyEmissive = 0;
deleteVertexBufferObject(glPolyShininess, polyBuffersContext, pgl);
glPolyShininess = 0;
deleteVertexBufferObject(glPolyIndex, polyBuffersContext, pgl);
glPolyIndex = 0;
polyBuffersCreated = false;
}
}
protected void finalizePolyBuffers() {
if (glPolyVertex != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolyVertex, polyBuffersContext);
glPolyVertex = 0;
}
if (glPolyColor != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolyColor, polyBuffersContext);
glPolyColor = 0;
}
if (glPolyNormal != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolyNormal, polyBuffersContext);
glPolyNormal = 0;
}
if (glPolyTexcoord != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolyTexcoord, polyBuffersContext);
glPolyTexcoord = 0;
}
if (glPolyAmbient != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolyAmbient, polyBuffersContext);
glPolyAmbient = 0;
}
if (glPolySpecular != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolySpecular, polyBuffersContext);
glPolySpecular = 0;
}
if (glPolyEmissive != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolyEmissive, polyBuffersContext);
glPolyEmissive = 0;
}
if (glPolyShininess != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolyShininess, polyBuffersContext);
glPolyShininess = 0;
}
if (glPolyIndex != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPolyIndex, polyBuffersContext);
glPolyIndex = 0;
}
polyBuffersCreated = false;
}
@@ -1526,41 +1503,28 @@ public class PGraphicsOpenGL extends PGraphics {
}
protected void deleteLineBuffers() {
if (lineBuffersCreated) {
deleteVertexBufferObject(glLineVertex, lineBuffersContext, pgl);
glLineVertex = 0;
deleteVertexBufferObject(glLineColor, lineBuffersContext, pgl);
glLineColor = 0;
deleteVertexBufferObject(glLineAttrib, lineBuffersContext, pgl);
glLineAttrib = 0;
deleteVertexBufferObject(glLineIndex, lineBuffersContext, pgl);
glLineIndex = 0;
lineBuffersCreated = false;
}
}
protected void finalizeLineBuffers() {
if (glLineVertex != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glLineVertex, lineBuffersContext);
glLineVertex = 0;
}
if (glLineColor != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glLineColor, lineBuffersContext);
glLineColor = 0;
}
if (glLineAttrib != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glLineAttrib, lineBuffersContext);
glLineAttrib = 0;
}
if (glLineIndex != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glLineIndex, lineBuffersContext);
glLineIndex = 0;
}
lineBuffersCreated = false;
}
@@ -1638,41 +1602,28 @@ public class PGraphicsOpenGL extends PGraphics {
}
protected void deletePointBuffers() {
if (pointBuffersCreated) {
deleteVertexBufferObject(glPointVertex, pointBuffersContext, pgl);
glPointVertex = 0;
deleteVertexBufferObject(glPointColor, pointBuffersContext, pgl);
glPointColor = 0;
deleteVertexBufferObject(glPointAttrib, pointBuffersContext, pgl);
glPointAttrib = 0;
deleteVertexBufferObject(glPointIndex, pointBuffersContext, pgl);
glPointIndex = 0;
pointBuffersCreated = false;
}
}
protected void finalizePointBuffers() {
if (glPointVertex != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPointVertex, pointBuffersContext);
glPointVertex = 0;
}
if (glPointColor != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPointColor, pointBuffersContext);
glPointColor = 0;
}
if (glPointAttrib != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPointAttrib, pointBuffersContext);
glPointAttrib = 0;
}
if (glPointIndex != 0) {
PGraphicsOpenGL.finalizeVertexBufferObject(glPointIndex, pointBuffersContext);
glPointIndex = 0;
}
pointBuffersCreated = false;
}