From 86001cfd6ce06d45e9890e4739a5c2216b356bf5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 28 Jun 2011 23:23:40 +0200 Subject: Sync w/ latest master --- src/com/jogamp/opencl/demos/radixsort/RadixSort.java | 9 ++------- src/com/jogamp/opencl/demos/radixsort/Scan.java | 9 +++------ 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(); } } -- cgit v1.2.3