summaryrefslogtreecommitdiffstats
path: root/test/com/jogamp/opencl
diff options
context:
space:
mode:
Diffstat (limited to 'test/com/jogamp/opencl')
-rw-r--r--test/com/jogamp/opencl/CLCommandQueueTest.java1
-rw-r--r--test/com/jogamp/opencl/CLProgramTest.java9
-rw-r--r--test/com/jogamp/opencl/HighLevelBindingTest.java1
-rw-r--r--test/com/jogamp/opencl/LowLevelBindingTest.java5
4 files changed, 13 insertions, 3 deletions
diff --git a/test/com/jogamp/opencl/CLCommandQueueTest.java b/test/com/jogamp/opencl/CLCommandQueueTest.java
index 5636a40d..f5438d40 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 a3ee26f3..d083c770 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();
@@ -268,7 +270,7 @@ public class CLProgramTest {
@Test
public void kernelTest() {
- String source = "__attribute__((reqd_work_group_size(1, 1, 1))) kernel void foo(float a, int b) { }\n";
+ String source = "__attribute__((reqd_work_group_size(1, 1, 1))) kernel void foo(float a, int b, short c) { }\n";
CLContext context = CLContext.create();
@@ -295,13 +297,16 @@ public class CLProgramTest {
kernel.putArg(2);
assertEquals(2, kernel.position());
+
+ kernel.putArg((short)3);
+ assertEquals(3, kernel.position());
try{
kernel.putArg(3);
fail("exception not thrown");
}catch (IndexOutOfBoundsException expected){ }
- assertEquals(2, kernel.position());
+ assertEquals(3, kernel.position());
assertEquals(0, kernel.rewind().position());
}finally{
diff --git a/test/com/jogamp/opencl/HighLevelBindingTest.java b/test/com/jogamp/opencl/HighLevelBindingTest.java
index 749db3a6..fe6bef51 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 43e3b931..c8e27a60 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.common.nio.PointerBuffer;
+import com.jogamp.opencl.llb.impl.BuildProgramCallback;
+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<Object>() {
+ @Override
public Object call() {
try {
out.println("###start iteration " + n);