GLRegion + RegionRenderer: Add clearShader(..) to delete all ShaderPrograms and is references.

3 files changed, 32 insertions, 5 deletions

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java
index 89693bb66..c09e75b53 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java
@@ -629,6 +629,18 @@ public final class VBORegion2PMSAAES2  extends GLRegion {
     }
 
     @Override
+    protected void clearShaderImpl(final GL2ES2 gl) {
+        if( null != spPass1 ) {
+            spPass1.destroy(gl);
+            spPass1 = null;
+        }
+        if( null != spPass2 ) {
+            spPass2.destroy(gl);
+            spPass2 = null;
+        }
+    }
+
+    @Override
     protected void destroyImpl(final GL2ES2 gl) {
         if(DEBUG_INSTANCE) {
             System.err.println("VBORegion2PES2 Destroy: " + this);
@@ -665,7 +677,5 @@ public final class VBORegion2PMSAAES2  extends GLRegion {
             indicesFbo.destroy(gl);
             indicesFbo = null;
         }
-        spPass1 = null;
-        spPass2 = null;
     }
 }
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java
index 9567bab10..96247c61a 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java
@@ -762,6 +762,18 @@ public final class VBORegion2PVBAAES2  extends GLRegion {
     }
 
     @Override
+    protected void clearShaderImpl(final GL2ES2 gl) {
+        if( null != spPass1 ) {
+            spPass1.destroy(gl);
+            spPass1 = null;
+        }
+        if( null != spPass2 ) {
+            spPass2.destroy(gl);
+            spPass2 = null;
+        }
+    }
+
+    @Override
     protected void destroyImpl(final GL2ES2 gl) {
         if(DEBUG_INSTANCE) {
             System.err.println("VBORegion2PES2 Destroy: " + this);
@@ -801,7 +813,5 @@ public final class VBORegion2PVBAAES2  extends GLRegion {
             indicesFbo.destroy(gl);
             indicesFbo = null;
         }
-        spPass1 = null;
-        spPass2 = null;
     }
 }
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
index adf3e4bc2..b8bdfbe37 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
@@ -345,6 +345,14 @@ public final class VBORegionSPES2 extends GLRegion {
     }
 
     @Override
+    protected void clearShaderImpl(final GL2ES2 gl) {
+        if( null != spPass1 ) {
+            spPass1.destroy(gl);
+            spPass1 = null;
+        }
+    }
+
+    @Override
     protected void destroyImpl(final GL2ES2 gl) {
         if(DEBUG_INSTANCE) {
             System.err.println("VBORegionSPES2 Destroy: " + this);
@@ -365,6 +373,5 @@ public final class VBORegionSPES2 extends GLRegion {
             indicesBuffer.destroy(gl);
             indicesBuffer = null;
         }
-        spPass1 = null;
     }
 }