switched from PointerBuffer to NativeSizeBuffer.

1 files changed, 52 insertions, 52 deletions

diff --git a/src/com/jogamp/opencl/CLCommandQueue.java b/src/com/jogamp/opencl/CLCommandQueue.java
index 7c567013..40c5cc02 100644
--- a/src/com/jogamp/opencl/CLCommandQueue.java
+++ b/src/com/jogamp/opencl/CLCommandQueue.java
@@ -30,7 +30,7 @@ package com.jogamp.opencl;
 
 import com.jogamp.common.nio.CachedBufferFactory;
 import com.jogamp.opencl.gl.CLGLI;
-import com.jogamp.common.nio.PointerBuffer;
+import com.jogamp.common.nio.NativeSizeBuffer;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
@@ -65,9 +65,9 @@ public class CLCommandQueue extends CLObject implements CLResource {
      * Those direct memory buffers are used to move data between the JVM and OpenCL.
      */
     private final IntBuffer pbA;
-    private final PointerBuffer ibA;
-    private final PointerBuffer ibB;
-    private final PointerBuffer ibC;
+    private final NativeSizeBuffer ibA;
+    private final NativeSizeBuffer ibB;
+    private final NativeSizeBuffer ibC;
 
     private CLCommandQueue(CLContext context, long id, CLDevice device, long properties) {
         super(context, id);
@@ -75,12 +75,12 @@ public class CLCommandQueue extends CLObject implements CLResource {
         this.device = device;
         this.properties = properties;
 
-        int pbsize = PointerBuffer.elementSize();
+        int pbsize = NativeSizeBuffer.elementSize();
         CachedBufferFactory factory = CachedBufferFactory.create(9*pbsize + 4, true);
         
-        this.ibA = PointerBuffer.wrap(factory.newDirectByteBuffer(3*pbsize));
-        this.ibB = PointerBuffer.wrap(factory.newDirectByteBuffer(3*pbsize));
-        this.ibC = PointerBuffer.wrap(factory.newDirectByteBuffer(3*pbsize));
+        this.ibA = NativeSizeBuffer.wrap(factory.newDirectByteBuffer(3*pbsize));
+        this.ibB = NativeSizeBuffer.wrap(factory.newDirectByteBuffer(3*pbsize));
+        this.ibC = NativeSizeBuffer.wrap(factory.newDirectByteBuffer(3*pbsize));
         
         this.pbA = factory.newDirectIntBuffer(1);
 
@@ -116,7 +116,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public CLCommandQueue putWriteBuffer(CLBuffer<?> writeBuffer, boolean blockingWrite, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -160,7 +160,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public CLCommandQueue putReadBuffer(CLBuffer<?> readBuffer, boolean blockingRead, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -209,7 +209,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public CLCommandQueue putCopyBuffer(CLBuffer<?> src, CLBuffer<?> dest, int srcOffset, int destOffset, long bytesToCopy, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -279,7 +279,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
             long rowPitch, long slicePitch, long hostRowPitch, long hostSlicePitch,
             boolean blockingWrite, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -357,7 +357,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
             long rowPitch, long slicePitch, long hostRowPitch, long hostSlicePitch,
             boolean blockingRead, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -438,7 +438,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
             long srcRowPitch, long srcSlicePitch, long destRowPitch, long destSlicePitch,
             CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -506,7 +506,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
     public CLCommandQueue putWriteImage(CLImage2d<?> writeImage, int inputRowPitch,
             int originX, int originY, int rangeX, int rangeY, boolean blockingWrite, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -568,7 +568,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
     public CLCommandQueue putWriteImage(CLImage3d<?> writeImage, int inputRowPitch, int inputSlicePitch,
             int originX, int originY, int originZ, int rangeX, int rangeY, int rangeZ, boolean blockingWrite, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -629,7 +629,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
     public CLCommandQueue putReadImage(CLImage2d<?> readImage, int inputRowPitch,
             int originX, int originY, int rangeX, int rangeY, boolean blockingRead, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -691,7 +691,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
     public CLCommandQueue putReadImage(CLImage3d<?> readImage, int inputRowPitch, int inputSlicePitch,
             int originX, int originY, int originZ, int rangeX, int rangeY, int rangeZ, boolean blockingRead, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -755,7 +755,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
                                         int dstOriginX, int dstOriginY,
                                         int rangeX, int rangeY, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -824,7 +824,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
                                         int dstOriginX, int dstOriginY, int dstOriginZ,
                                         int rangeX, int rangeY, int rangeZ, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -888,7 +888,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
                                         long srcOffset, int dstOriginX, int dstOriginY,
                                         int rangeX, int rangeY, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -955,7 +955,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
                                         long srcOffset, int dstOriginX, int dstOriginY, int dstOriginZ,
                                         int rangeX, int rangeY, int rangeZ, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1019,7 +1019,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
                                         int srcOriginX, int srcOriginY,
                                         int rangeX, int rangeY, long dstOffset, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1086,7 +1086,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
                                         int srcOriginX, int srcOriginY, int srcOriginZ, 
                                         int rangeX, int rangeY, int rangeZ, long dstOffset, CLEventList condition, CLEventList events) {
         
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1144,7 +1144,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public ByteBuffer putMapBuffer(CLBuffer<?> buffer, CLMemory.Map flag, long offset, long length, boolean blockingMap, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1204,7 +1204,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
                                     int offsetX, int offsetY,
                                     int rangeX, int rangeY, boolean blockingMap, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1270,7 +1270,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
                                     int offsetX, int offsetY, int offsetZ,
                                     int rangeX, int rangeY, int rangeZ, boolean blockingMap, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1314,7 +1314,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public CLCommandQueue putUnmapMemory(CLMemory<?> memory, Buffer mapped, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1350,7 +1350,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public CLCommandQueue putWaitForEvent(CLEventList list, int index, boolean blockingWait) {
 
-        PointerBuffer ids = PointerBuffer.wrap(list.IDs.getBuffer().duplicate()).position(index);
+        NativeSizeBuffer ids = NativeSizeBuffer.wrap(list.IDs.getBuffer().duplicate()).position(index);
         
         int ret = blockingWait ? cl.clWaitForEvents(1, ids)
                                : cl.clEnqueueWaitForEvents(ID, 1, ids);
@@ -1407,7 +1407,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public CLCommandQueue putTask(CLKernel kernel, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1444,9 +1444,9 @@ public class CLCommandQueue extends CLObject implements CLResource {
      * Calls {@native clEnqueueNDRangeKernel}.
      */
     public CLCommandQueue put1DRangeKernel(CLKernel kernel, long globalWorkOffset, long globalWorkSize, long localWorkSize, CLEventList condition, CLEventList events) {
-        PointerBuffer globWO = null;
-        PointerBuffer globWS = null;
-        PointerBuffer locWS = null;
+        NativeSizeBuffer globWO = null;
+        NativeSizeBuffer globWS = null;
+        NativeSizeBuffer locWS = null;
 
         if(globalWorkOffset != 0) {
             globWO = copy2NIO(ibA, globalWorkOffset);
@@ -1495,9 +1495,9 @@ public class CLCommandQueue extends CLObject implements CLResource {
     public CLCommandQueue put2DRangeKernel(CLKernel kernel, long globalWorkOffsetX, long globalWorkOffsetY,
                                                             long globalWorkSizeX, long globalWorkSizeY,
                                                             long localWorkSizeX, long localWorkSizeY, CLEventList condition, CLEventList events) {
-        PointerBuffer globalWorkOffset = null;
-        PointerBuffer globalWorkSize = null;
-        PointerBuffer localWorkSize = null;
+        NativeSizeBuffer globalWorkOffset = null;
+        NativeSizeBuffer globalWorkSize = null;
+        NativeSizeBuffer localWorkSize = null;
 
         if(globalWorkOffsetX != 0 || globalWorkOffsetY != 0) {
             globalWorkOffset = copy2NIO(ibA, globalWorkOffsetX, globalWorkOffsetY);
@@ -1545,9 +1545,9 @@ public class CLCommandQueue extends CLObject implements CLResource {
     public CLCommandQueue put3DRangeKernel(CLKernel kernel, long globalWorkOffsetX, long globalWorkOffsetY, long globalWorkOffsetZ,
                                                             long globalWorkSizeX, long globalWorkSizeY, long globalWorkSizeZ,
                                                             long localWorkSizeX, long localWorkSizeY, long localWorkSizeZ, CLEventList condition, CLEventList events) {
-        PointerBuffer globalWorkOffset = null;
-        PointerBuffer globalWorkSize = null;
-        PointerBuffer localWorkSize = null;
+        NativeSizeBuffer globalWorkOffset = null;
+        NativeSizeBuffer globalWorkSize = null;
+        NativeSizeBuffer localWorkSize = null;
 
         if(globalWorkOffsetX != 0 || globalWorkOffsetY != 0 || globalWorkOffsetZ != 0) {
             globalWorkOffset = copy2NIO(ibA, globalWorkOffsetX, globalWorkOffsetY, globalWorkOffsetZ);
@@ -1565,7 +1565,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
     /**
      * Calls {@native clEnqueueNDRangeKernel}.
      */
-    public CLCommandQueue putNDRangeKernel(CLKernel kernel, int workDimension, PointerBuffer globalWorkOffset, PointerBuffer globalWorkSize, PointerBuffer localWorkSize) {
+    public CLCommandQueue putNDRangeKernel(CLKernel kernel, int workDimension, NativeSizeBuffer globalWorkOffset, NativeSizeBuffer globalWorkSize, NativeSizeBuffer localWorkSize) {
         this.putNDRangeKernel(kernel, workDimension, globalWorkOffset, globalWorkSize, localWorkSize, null, null);
         return this;
     }
@@ -1573,7 +1573,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
     /**
      * Calls {@native clEnqueueNDRangeKernel}.
      */
-    public CLCommandQueue putNDRangeKernel(CLKernel kernel, int workDimension, PointerBuffer globalWorkOffset, PointerBuffer globalWorkSize, PointerBuffer localWorkSize, CLEventList events) {
+    public CLCommandQueue putNDRangeKernel(CLKernel kernel, int workDimension, NativeSizeBuffer globalWorkOffset, NativeSizeBuffer globalWorkSize, NativeSizeBuffer localWorkSize, CLEventList events) {
         this.putNDRangeKernel(kernel, workDimension, globalWorkOffset, globalWorkSize, localWorkSize, null, events);
         return this;
     }
@@ -1581,10 +1581,10 @@ public class CLCommandQueue extends CLObject implements CLResource {
     /**
      * Calls {@native clEnqueueNDRangeKernel}.
      */
-    public CLCommandQueue putNDRangeKernel(CLKernel kernel, int workDimension, PointerBuffer globalWorkOffset,
-            PointerBuffer globalWorkSize, PointerBuffer localWorkSize, CLEventList condition, CLEventList events) {
+    public CLCommandQueue putNDRangeKernel(CLKernel kernel, int workDimension, NativeSizeBuffer globalWorkOffset,
+            NativeSizeBuffer globalWorkSize, NativeSizeBuffer localWorkSize, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1635,7 +1635,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public CLCommandQueue putAcquireGLObject(long glObject, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1644,7 +1644,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
 
         CLGLI xl = (CLGLI) cl;
 
-        PointerBuffer glObj = copy2NIO(ibA, glObject);
+        NativeSizeBuffer glObj = copy2NIO(ibA, glObject);
         
         int ret = xl.clEnqueueAcquireGLObjects(ID, 1, glObj,
                     conditions, conditionIDs,
@@ -1682,7 +1682,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
      */
     public CLCommandQueue putReleaseGLObject(long glObject, CLEventList condition, CLEventList events) {
 
-        PointerBuffer conditionIDs = null;
+        NativeSizeBuffer conditionIDs = null;
         int conditions = 0;
         if(condition != null) {
             conditionIDs = condition.IDsView;
@@ -1691,7 +1691,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
 
         CLGLI xl = (CLGLI) cl;
 
-        PointerBuffer glObj = copy2NIO(ibA, glObject);
+        NativeSizeBuffer glObj = copy2NIO(ibA, glObject);
 
         int ret = xl.clEnqueueReleaseGLObjects(ID, 1, glObj,
                 conditions, conditionIDs,
@@ -1748,19 +1748,19 @@ public class CLCommandQueue extends CLObject implements CLResource {
         }
     }
 
-    private static PointerBuffer copy2NIO(PointerBuffer buffer, long a) {
+    private static NativeSizeBuffer copy2NIO(NativeSizeBuffer buffer, long a) {
         return buffer.put(2, a).position(2);
     }
 
-    private static PointerBuffer copy2NIO(PointerBuffer buffer, long a, long b) {
+    private static NativeSizeBuffer copy2NIO(NativeSizeBuffer buffer, long a, long b) {
         return buffer.position(1).put(a).put(b).position(1);
     }
 
-    private static PointerBuffer copy2NIO(PointerBuffer buffer, long a, long b, long c) {
+    private static NativeSizeBuffer copy2NIO(NativeSizeBuffer buffer, long a, long b, long c) {
         return buffer.rewind().put(a).put(b).put(c).rewind();
     }
 
-    private static String toStr(PointerBuffer buffer) {
+    private static String toStr(NativeSizeBuffer buffer) {
         if(buffer == null) {
             return null;
         }