make sure live wallpapers work properly

codeanticode · codeanticode · commit de39c83f920e · 2017-01-29T07:50:08.000-05:00
dispose native GL objects only when context is still current, dispose
PGL's FBO layer when re-creating surface
diff --git a/core/src/processing/a2d/PGraphicsAndroid2D.java b/core/src/processing/a2d/PGraphicsAndroid2D.java
@@ -167,7 +167,7 @@ public void dispose() {
 
 
   @Override
-  public PSurface createSurface(AppComponent component, SurfaceHolder holder) {  // ignore
+  public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
     return new PSurfaceAndroid2D(this, component, holder);
   }
 
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -492,7 +492,7 @@ public void initSurface(LayoutInflater inflater, ViewGroup container,
     if (DEBUG) println("Renderer " + rendererName);
     g = makeGraphics(width, height, rendererName, true);
     if (DEBUG) println("Created renderer");
-    surface = g.createSurface(component, holder);
+    surface = g.createSurface(component, holder, false);
     if (DEBUG) println("Created surface");
 
     //set smooth level
@@ -536,7 +536,7 @@ public void resetSurface(LayoutInflater inflater, ViewGroup container,
       surface.stopThread(false);
       surface.dispose();
     }
-    surface = g.createSurface(component, holder);
+    surface = g.createSurface(component, holder, true);
 
     if (parentLayout == -1) {
       setFullScreenVisibility();
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -725,7 +725,7 @@ public void dispose() {  // ignore
   }
 
 
-  public PSurface createSurface(AppComponent component, SurfaceHolder holder) {  // ignore
+  public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
     return null;
   }
 
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -680,7 +680,8 @@ public PSurface createSurface() {  // ignore
 
   @Override
   // Android only
-  public PSurface createSurface(AppComponent component, SurfaceHolder holder) {  // ignore
+  public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
+    if (reset) pgl.resetFBOLayer();
     return new PSurfaceGLES(this, component, holder);
   }
 
@@ -876,7 +877,7 @@ public GLResourceTexture(Texture tex) {
     }
 
     private void disposeNative() {
-      if (pgl != null) {
+      if (pgl != null && pgl.contextIsCurrent(context)) {
         if (glName != 0) {
           intBuffer.put(0, glName);
           pgl.deleteTextures(1, intBuffer);
@@ -950,7 +951,7 @@ public GLResourceVertexBuffer(VertexBuffer vbo) {
     }
 
     private void disposeNative() {
-      if (pgl != null) {
+      if (pgl != null && pgl.contextIsCurrent(context)) {
         if (glId != 0) {
           intBuffer.put(0, glId);
           pgl.deleteBuffers(1, intBuffer);
@@ -1030,7 +1031,7 @@ public GLResourceShader(PShader sh) {
     }
 
     private void disposeNative() {
-      if (pgl != null) {
+      if (pgl != null && pgl.contextIsCurrent(context)) {
         if (glFragment != 0) {
           pgl.deleteShader(glFragment);
           glFragment = 0;
@@ -1145,7 +1146,7 @@ public GLResourceFrameBuffer(FrameBuffer fb) {
     }
 
     private void disposeNative() {
-      if (pgl != null) {
+      if (pgl != null && pgl.contextIsCurrent(context)) {
         if (glFbo != 0) {
           intBuffer.put(0, glFbo);
           pgl.deleteFramebuffers(1, intBuffer);
diff --git a/libraries/cardboard/src/processing/cardboard/PGraphicsCardboardMono.java b/libraries/cardboard/src/processing/cardboard/PGraphicsCardboardMono.java
@@ -28,7 +28,8 @@
 
 public class PGraphicsCardboardMono extends PGraphicsCardboard {
   @Override
-  public PSurface createSurface(AppComponent component, SurfaceHolder holder) {  // ignore
+  public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
+    if (reset) pgl.resetFBOLayer();
     return new PSurfaceCardboard(this, component, holder, false);
   }
 }
diff --git a/libraries/cardboard/src/processing/cardboard/PGraphicsCardboardStereo.java b/libraries/cardboard/src/processing/cardboard/PGraphicsCardboardStereo.java
@@ -28,7 +28,8 @@
 
 public class PGraphicsCardboardStereo extends PGraphicsCardboard {
   @Override
-  public PSurface createSurface(AppComponent component, SurfaceHolder holder) {  // ignore
+  public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
+    if (reset) pgl.resetFBOLayer();
     return new PSurfaceCardboard(this, component, holder, true);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public void dispose() {`
`167`	`167`
`168`	`168`
`169`	`169`	`@Override`
`170`		`- public PSurface createSurface(AppComponent component, SurfaceHolder holder) { // ignore`
	`170`	`+ public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) { // ignore`
`171`	`171`	`return new PSurfaceAndroid2D(this, component, holder);`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ public void dispose() { // ignore`
`725`	`725`	`}`
`726`	`726`
`727`	`727`
`728`		`- public PSurface createSurface(AppComponent component, SurfaceHolder holder) { // ignore`
	`728`	`+ public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) { // ignore`
`729`	`729`	`return null;`
`730`	`730`	`}`
`731`	`731`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@`
`28`	`28`
`29`	`29`	`public class PGraphicsCardboardMono extends PGraphicsCardboard {`
`30`	`30`	`@Override`
`31`		`- public PSurface createSurface(AppComponent component, SurfaceHolder holder) { // ignore`
	`31`	`+ public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) { // ignore`
	`32`	`+ if (reset) pgl.resetFBOLayer();`
`32`	`33`	`return new PSurfaceCardboard(this, component, holder, false);`
`33`	`34`	`}`
`34`	`35`	`}`