From a444a384b808e423f2e8377ff14c69b0c4be043a Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Fri, 27 May 2011 03:00:12 +0200 Subject: LLB refactoring. - split up CL into multiple sub interfaces - seperation is now feature wise - introdused llb package for low level classes --- test/com/jogamp/opencl/CLCommandQueueTest.java | 1 + test/com/jogamp/opencl/CLProgramTest.java | 2 ++ test/com/jogamp/opencl/HighLevelBindingTest.java | 1 + test/com/jogamp/opencl/LowLevelBindingTest.java | 5 ++++- 4 files changed, 8 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/com/jogamp/opencl/CLCommandQueueTest.java b/test/com/jogamp/opencl/CLCommandQueueTest.java index 5636a40..f5438d4 100644 --- a/test/com/jogamp/opencl/CLCommandQueueTest.java +++ b/test/com/jogamp/opencl/CLCommandQueueTest.java @@ -37,6 +37,7 @@ import com.jogamp.opencl.CLCommandQueue.Mode; import com.jogamp.opencl.CLMemory.Mem; import com.jogamp.opencl.util.CLDeviceFilters; import com.jogamp.opencl.util.CLPlatformFilters; +import com.jogamp.opencl.llb.CL; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.IntBuffer; diff --git a/test/com/jogamp/opencl/CLProgramTest.java b/test/com/jogamp/opencl/CLProgramTest.java index a3ee26f..4d3b0cf 100644 --- a/test/com/jogamp/opencl/CLProgramTest.java +++ b/test/com/jogamp/opencl/CLProgramTest.java @@ -32,6 +32,7 @@ import com.jogamp.opencl.util.CLBuildConfiguration; import com.jogamp.opencl.util.CLProgramConfiguration; import com.jogamp.opencl.CLProgram.Status; import com.jogamp.opencl.util.CLBuildListener; +import com.jogamp.opencl.llb.CL; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -221,6 +222,7 @@ public class CLProgramTest { final CLProgram outerProgram = program; CLBuildListener buildCallback = new CLBuildListener() { + @Override public void buildFinished(CLProgram program) { assertEquals(outerProgram, program); countdown.countDown(); diff --git a/test/com/jogamp/opencl/HighLevelBindingTest.java b/test/com/jogamp/opencl/HighLevelBindingTest.java index 749db3a..fe6bef5 100644 --- a/test/com/jogamp/opencl/HighLevelBindingTest.java +++ b/test/com/jogamp/opencl/HighLevelBindingTest.java @@ -39,6 +39,7 @@ import com.jogamp.opencl.CLDevice.GlobalMemCacheType; import com.jogamp.opencl.CLDevice.LocalMemType; import com.jogamp.opencl.CLDevice.Type; import com.jogamp.opencl.CLDevice.Capabilities; +import com.jogamp.opencl.llb.CL; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; diff --git a/test/com/jogamp/opencl/LowLevelBindingTest.java b/test/com/jogamp/opencl/LowLevelBindingTest.java index 9e60387..655bfc6 100644 --- a/test/com/jogamp/opencl/LowLevelBindingTest.java +++ b/test/com/jogamp/opencl/LowLevelBindingTest.java @@ -29,8 +29,9 @@ package com.jogamp.opencl; import java.util.Random; -import com.jogamp.opencl.impl.BuildProgramCallback; +import com.jogamp.opencl.llb.impl.BuildProgramCallback; import com.jogamp.common.nio.NativeSizeBuffer; +import com.jogamp.opencl.llb.CL; import java.nio.ByteBuffer; import java.nio.IntBuffer; @@ -292,6 +293,7 @@ public class LowLevelBindingTest { // tests if the callback is called final CountDownLatch latch = new CountDownLatch(1); BuildProgramCallback callback = new BuildProgramCallback() { + @Override public void buildFinished(long cl_program) { try{ assertEquals(program, cl_program); @@ -421,6 +423,7 @@ public class LowLevelBindingTest { for(int i = 0; i < 100; i++) { final int n = i; tasks.add(new Callable() { + @Override public Object call() { try { out.println("###start iteration " + n); -- cgit v1.2.3