BridJ: breaking change: pointerTo(NativeObject) becomes getPointer(NativeObject).

ochafik · ochafik · commit 5d8a5eef2167 · 2013-07-30T08:52:57.000+01:00
This way, all remaining variants of pointerTo* take an immutable value
that is copied to the resulting allocated pointer.
(pointerTo(NativeObject) was the only variant not to allocate anything)
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java
@@ -120,7 +120,7 @@ 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()
-		    long mem = CL.clCreateSubBuffer(getEntity(), usage.getIntFlags(), CL_BUFFER_CREATE_TYPE_REGION, getPeer(pointerTo(region)), getPeer(pErr));
+		    long mem = CL.clCreateSubBuffer(getEntity(), usage.getIntFlags(), CL_BUFFER_CREATE_TYPE_REGION, getPeer(getPointer(region)), getPeer(pErr));
 	        #checkPErr()
 	        return mem == 0 ? null : new CLBuffer<T>(context, length * s, mem, null, io);
 		} catch (Throwable th) {
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java
@@ -541,7 +541,7 @@ public CLImage2D createImage2D(CLMem.Usage usage, CLImageFormat format, long wid
 		}
 
 		#declareReusablePtrsAndPErr()
-		Pointer<cl_image_format> pImageFormat = pointerTo(format.to_cl_image_format());
+		Pointer<cl_image_format> pImageFormat = getPointer(format.to_cl_image_format());
 		Pointer<?> pBuffer = buffer == null ? null : pointerToBuffer(buffer);
 		long mem;
 		int previousAttempts = 0;
@@ -578,7 +578,7 @@ public CLImage3D createImage3D(CLMem.Usage usage, CLImageFormat format, long wid
 		}
 
 		#declareReusablePtrsAndPErr()
-		Pointer<cl_image_format> pImageFormat = pointerTo(format.to_cl_image_format());
+		Pointer<cl_image_format> pImageFormat = getPointer(format.to_cl_image_format());
 		Pointer<?> pBuffer = buffer == null ? null : pointerToBuffer(buffer);
 		long mem;
 		int previousAttempts = 0;
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLEvent.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLEvent.java
@@ -76,7 +76,7 @@ public void apply(@Ptr long evt, int executionStatus, @Ptr long callbackPeer) {
 			}
 		}
 	};
-	private static final long eventCallbackPeer = getPeer(pointerTo(eventCallback));
+	private static final long eventCallbackPeer = getPeer(getPointer(eventCallback));
 	
     /**
 #documentCallsFunction("clSetEventCallback")
diff --git a/Core/src/main/velocity/com/nativelibs4java/opencl/CLMem.java b/Core/src/main/velocity/com/nativelibs4java/opencl/CLMem.java
@@ -71,7 +71,7 @@ public void apply(@Ptr long mem, @Ptr long userData) {
     		}
     	};
     	BridJ.protectFromGC(cb);
-    	error(CL.clSetMemObjectDestructorCallback(getEntity(), getPeer(pointerTo(cb)), 0));
+    	error(CL.clSetMemObjectDestructorCallback(getEntity(), getPeer(getPointer(cb)), 0));
     }
     
     public CLEvent acquireGLObject(CLQueue queue, CLEvent... eventsToWaitFor) {
diff --git a/JavaCL/src/test/java/com/nativelibs4java/opencl/generator/GeneratorTest.java b/JavaCL/src/test/java/com/nativelibs4java/opencl/generator/GeneratorTest.java
@@ -20,7 +20,7 @@ public void testStructs() throws IOException {
         
         Structs structs = new Structs(context);
         Structs.S s = new Structs.S();
-        Pointer<Structs.S> pS = Pointer.pointerTo(s);
+        Pointer<Structs.S> pS = Pointer.getPointer(s);
         CLBuffer<Structs.S> b = context.createBuffer(CLMem.Usage.InputOutput, pS);
         
         CLEvent e = structs.f(queue, b, new int[] { 1 }, null);
diff --git a/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/proxy/PointerUtils.java b/OpenCL4Java/src/main/java/com/nativelibs4java/opencl/proxy/PointerUtils.java
@@ -23,7 +23,7 @@ protected static void setPointerAtIndex(long peer, int index, Pointer<?> value)
     }
     
     protected static void setPointerAtIndex(long peer, int index, NativeObject value) {
-        pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.pointerTo(value)));
+        pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.getPointer(value)));
     }
     
     protected static long getSizeT(long peer) {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void apply(@Ptr long evt, int executionStatus, @Ptr long callbackPeer) {`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`};`
`79`		`- private static final long eventCallbackPeer = getPeer(pointerTo(eventCallback));`
	`79`	`+ private static final long eventCallbackPeer = getPeer(getPointer(eventCallback));`
`80`	`80`
`81`	`81`	`/**`
`82`	`82`	`#documentCallsFunction("clSetEventCallback")`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void apply(@Ptr long mem, @Ptr long userData) {`
`71`	`71`	`}`
`72`	`72`	`};`
`73`	`73`	`BridJ.protectFromGC(cb);`
`74`		`- error(CL.clSetMemObjectDestructorCallback(getEntity(), getPeer(pointerTo(cb)), 0));`
	`74`	`+ error(CL.clSetMemObjectDestructorCallback(getEntity(), getPeer(getPointer(cb)), 0));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public CLEvent acquireGLObject(CLQueue queue, CLEvent... eventsToWaitFor) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected static void setPointerAtIndex(long peer, int index, Pointer<?> value)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`protected static void setPointerAtIndex(long peer, int index, NativeObject value) {`
`26`		`- pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.pointerTo(value)));`
	`26`	`+ pointerToAddress(peer).setSizeTAtIndex(index, Pointer.getPeer(Pointer.getPointer(value)));`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`protected static long getSizeT(long peer) {`