summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/jogamp/opencl/CLContext.java2
-rw-r--r--test/com/jogamp/opencl/HighLevelBindingTest.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/com/jogamp/opencl/CLContext.java b/src/com/jogamp/opencl/CLContext.java
index 928adabb..235bb3a8 100644
--- a/src/com/jogamp/opencl/CLContext.java
+++ b/src/com/jogamp/opencl/CLContext.java
@@ -548,7 +548,7 @@ public class CLContext extends CLObjectResource {
release(memoryObjects);
release(samplers);
- for (List<CLCommandQueue> queues : queuesMap.values()) {
+ for (List<CLCommandQueue> queues : new ArrayList<List<CLCommandQueue>>(queuesMap.values())) {
release(queues);
}
diff --git a/test/com/jogamp/opencl/HighLevelBindingTest.java b/test/com/jogamp/opencl/HighLevelBindingTest.java
index 2e781ff5..449ccd7b 100644
--- a/test/com/jogamp/opencl/HighLevelBindingTest.java
+++ b/test/com/jogamp/opencl/HighLevelBindingTest.java
@@ -228,6 +228,11 @@ public class HighLevelBindingTest {
CLPlatform platform = CLPlatform.getDefault(version(CL_1_1), type(CPU));
+ if(platform == null) {
+ out.println("test aborted, no CPU for device fission found");
+ return;
+ }
+
CLDevice[] devices = platform.listCLDevices();
for (CLDevice device : devices) {