summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2011-06-28 23:23:40 +0200
committerSven Gothel <sgothel@jausoft.com>2011-06-28 23:23:40 +0200
commit86001cfd6ce06d45e9890e4739a5c2216b356bf5 (patch)
tree717f8edd900226292d49b86a13613d2cb0d0ad96
parent3039c6edca8028252ddf578d36297d4461d50bd7 (diff)
Sync w/ latest master
-rw-r--r--src/com/jogamp/opencl/demos/radixsort/RadixSort.java9
-rw-r--r--src/com/jogamp/opencl/demos/radixsort/Scan.java9
2 files changed, 5 insertions, 13 deletions
diff --git a/src/com/jogamp/opencl/demos/radixsort/RadixSort.java b/src/com/jogamp/opencl/demos/radixsort/RadixSort.java
index 9a89760..ceb9310 100644
--- a/src/com/jogamp/opencl/demos/radixsort/RadixSort.java
+++ b/src/com/jogamp/opencl/demos/radixsort/RadixSort.java
@@ -159,6 +159,7 @@ public class RadixSort implements CLResource {
queue.put1DRangeKernel(ckReorderDataKeysOnly, 0, globalWorkSize, localWorkSize);
}
+ @Override
public void release() {
scan.release();
@@ -173,14 +174,8 @@ public class RadixSort implements CLResource {
mBlockOffsets.release();
}
+ @Override
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 b25d06d..d5e158d 100644
--- a/src/com/jogamp/opencl/demos/radixsort/Scan.java
+++ b/src/com/jogamp/opencl/demos/radixsort/Scan.java
@@ -117,6 +117,7 @@ public class Scan implements CLResource {
return ((x - 1) & x) == 0;
}
+ @Override
public void release() {
program.release();
@@ -125,12 +126,8 @@ public class Scan implements CLResource {
}
}
+ @Override
public boolean isReleased() {
- throw new UnsupportedOperationException();
- // FIXME: return program.isReleased();
- }
-
- public void close() {
- release();
+ return program.isReleased();
}
}