JavaCL: removed defunc non-raw low-level bindings

ochafik · ochafik · commit 1d476be656be · 2012-06-24T21:32:43.000+01:00
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java
@@ -89,9 +89,9 @@ public CLBuffer<T> createSubBuffer(Usage usage, long offset, long length) {
 			int s = getElementSize();
 			cl_buffer_region region = new cl_buffer_region().origin(s * offset).size(s * length);
 			#declareReusablePtrsAndPErr()
-		    cl_mem mem = CL.clCreateSubBuffer(getEntity(), usage.getIntFlags(), CL_BUFFER_CREATE_TYPE_REGION, pointerTo(region), pErr);
+		    long mem = CL.clCreateSubBuffer(getEntityPeer(), usage.getIntFlags(), CL_BUFFER_CREATE_TYPE_REGION, getPeer(pointerTo(region)), getPeer(pErr));
 	        #checkPErr()
-	        return mem == null ? null : new CLBuffer<T>(context, length * s, getPeer(mem), null, io);
+	        return mem == 0 ? null : new CLBuffer<T>(context, length * s, mem, null, io);
 		} catch (Throwable th) {
     		// TODO check if supposed to handle OpenCL 1.1
     		throw new UnsupportedOperationException("Cannot create sub-buffer (OpenCL 1.1 feature).", th);
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java
@@ -312,7 +312,7 @@ public CLProgram createProgram(Map<CLDevice, byte[]> binaries, String source) {
 	//cl_queue queue;
 	@Override
 	protected void clear() {
-		error(CL.clReleaseContext(getEntity()));
+		error(CL.clReleaseContext(getEntityPeer()));
 	}
 
 
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/OverheadTest.java b/Core/src/test/java/com/nativelibs4java/opencl/OverheadTest.java
@@ -79,6 +79,7 @@ public void compareVariousSetArgsPerformance() throws CLBuildException {
            kernel.setArg(4, (byte)1);
            kernel.setArg(5, 1.0f);
         }};
+        /*
         Runnable setWithCLAPI = new Runnable() {
             private final OpenCLLibrary CL = new OpenCLLibrary();
             private final Pointer<?> tmp = allocateBytes(8);
@@ -91,6 +92,7 @@ public void run() {
                 CL.clSetKernelArg(kernel.getEntity(), 5, 4L, tmp.setFloat(1));
             }
         };
+        */
         Runnable setWithRawCLAPI = new Runnable() { 
             private final long aPeer = a.getEntityPeer();
             private final long bPeer = b.getEntityPeer();
@@ -113,15 +115,15 @@ public void run() {
         };
         
         int nWarmup = 8000, nTest = 50000;
-        time(null, nWarmup, setWithCLAPI, null);
+        //time(null, nWarmup, setWithCLAPI, null);
         time(null, nWarmup, setWithSetArgs, null);
         time(null, nWarmup, setWithSpecializedSetArg, null);
         time(null, nWarmup, setWithRawCLAPI, null);
         
         int nSamples = 10;
         double totSetArgs = 0, totCLSetKernelArg = 0, totSetArg = 0, totCLSetKernelArgRaw = 0;
         for (int i = 0; i < nSamples; i++) {
-            totCLSetKernelArg += time("clSetKernelArg pointers", nTest, setWithCLAPI, null);
+            //totCLSetKernelArg += time("clSetKernelArg pointers", nTest, setWithCLAPI, null);
             totSetArgs += time("CLKernel.setArgs", nTest, setWithSetArgs, null);
             totSetArg += time("CLKernel.setArg", nTest, setWithSpecializedSetArg, null);
             totCLSetKernelArgRaw += time("clSetKernelArg raw", nTest, setWithRawCLAPI, null);
diff --git a/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java b/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/library/OpenCLLibrary.java

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ public CLProgram createProgram(Map<CLDevice, byte[]> binaries, String source) {`
`312`	`312`	`//cl_queue queue;`
`313`	`313`	`@Override`
`314`	`314`	`protected void clear() {`
`315`		`- error(CL.clReleaseContext(getEntity()));`
	`315`	`+ error(CL.clReleaseContext(getEntityPeer()));`
`316`	`316`	`}`
`317`	`317`
`318`	`318`