Fix merge w/ latest mbien/master

4 files changed, 19 insertions, 2 deletions

diff --git a/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java b/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java
index 9c6b648..67c4957 100644
--- a/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java
+++ b/src/com/jogamp/opencl/demos/fractal/MultiDeviceFractal.java
@@ -123,6 +123,7 @@ public class MultiDeviceFractal implements GLEventListener {
         textRenderer = new TextRenderer(frame.getFont().deriveFont(Font.BOLD, 14), true, true, null, false);
     }
 
+    @Override
     public void init(GLAutoDrawable drawable) {
 
         if(clContext == null) {
@@ -349,6 +350,7 @@ public class MultiDeviceFractal implements GLEventListener {
     }
 
     // rendering cycle
+    @Override
     public void display(GLAutoDrawable drawable) {
         GL gl = drawable.getGL();
 
@@ -438,6 +440,7 @@ public class MultiDeviceFractal implements GLEventListener {
         textRenderer.endRendering();
     }
 
+    @Override
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {
 
         if(this.width == width && this.height == height)
@@ -540,6 +543,7 @@ public class MultiDeviceFractal implements GLEventListener {
         win.dispose();
     }
 
+    @Override
     public void dispose(GLAutoDrawable drawable) {
     }
 
@@ -549,7 +553,7 @@ public class MultiDeviceFractal implements GLEventListener {
         GLProfile.initSingleton(false);
         
         SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
+            @Override public void run() {
                 new MultiDeviceFractal(512, 512);
             }
         });
diff --git a/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java b/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
index 19f9e42..8fb4c9f 100644
--- a/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
+++ b/src/com/jogamp/opencl/demos/joglinterop/GLCLInteroperabilityDemo.java
@@ -81,7 +81,7 @@ public class GLCLInteroperabilityDemo implements GLEventListener {
 //        ib.rewind();
 
         SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
+            @Override public void run() {
                 initUI();
             }
         });
@@ -111,6 +111,7 @@ public class GLCLInteroperabilityDemo implements GLEventListener {
     }
 
 
+    @Override
     public void init(GLAutoDrawable drawable) {
 
         if(clContext == null) {
@@ -198,6 +199,7 @@ public class GLCLInteroperabilityDemo implements GLEventListener {
     }
 
 
+    @Override
     public void display(GLAutoDrawable drawable) {
 
         GL2 gl = drawable.getGL().getGL2();
@@ -266,6 +268,7 @@ public class GLCLInteroperabilityDemo implements GLEventListener {
     }
 
 
+    @Override
     public void reshape(GLAutoDrawable drawable, int arg1, int arg2, int width, int height) {
         this.width = width;
         this.height = height;
@@ -274,6 +277,7 @@ public class GLCLInteroperabilityDemo implements GLEventListener {
         pushPerspectiveView(gl);
     }
 
+    @Override
     public void dispose(GLAutoDrawable drawable) {  }
 
     public static void main(String[] args) {
diff --git a/src/com/jogamp/opencl/demos/radixsort/RadixSort.java b/src/com/jogamp/opencl/demos/radixsort/RadixSort.java
index e2a7b46..9a89760 100644
--- a/src/com/jogamp/opencl/demos/radixsort/RadixSort.java
+++ b/src/com/jogamp/opencl/demos/radixsort/RadixSort.java
@@ -173,6 +173,10 @@ public class RadixSort implements CLResource {
         mBlockOffsets.release();
     }
 
+    public boolean isReleased() {
+        return scan.isReleased();
+    }
+
     public void close() {
         release();
     }
diff --git a/src/com/jogamp/opencl/demos/radixsort/Scan.java b/src/com/jogamp/opencl/demos/radixsort/Scan.java
index 3d364ed..b25d06d 100644
--- a/src/com/jogamp/opencl/demos/radixsort/Scan.java
+++ b/src/com/jogamp/opencl/demos/radixsort/Scan.java
@@ -125,6 +125,11 @@ public class Scan implements CLResource {
         }
     }
 
+    public boolean isReleased() {
+        throw new UnsupportedOperationException();
+        // FIXME: return program.isReleased();
+    }
+
     public void close() {
         release();
     }