summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2011-05-01 06:56:02 +0200
committerSven Gothel <sgothel@jausoft.com>2011-05-01 06:56:02 +0200
commit454f81a14da543faebae4c8e6adebb3256a2e646 (patch)
tree0ebb654ae2c7e943c0c0844abbf45948b2506a49
parent493ff62aa94c224a7b5db6ea092e3c80ff0205bc (diff)
Sync w/ gluegen change 8f8aa3f73e3c9804c4a86f5d4fdac257d50d831a / PointerBuffer's elementSize() is no more static
-rw-r--r--src/com/jogamp/opencl/CLCommandQueue.java2
-rw-r--r--src/com/jogamp/opencl/CLMemory.java2
-rw-r--r--src/com/jogamp/opencl/CLProgram.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/com/jogamp/opencl/CLCommandQueue.java b/src/com/jogamp/opencl/CLCommandQueue.java
index d24fb115..30757bad 100644
--- a/src/com/jogamp/opencl/CLCommandQueue.java
+++ b/src/com/jogamp/opencl/CLCommandQueue.java
@@ -74,7 +74,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
this.device = device;
this.properties = properties;
- int pbsize = PointerBuffer.elementSize();
+ int pbsize = PointerBuffer.ELEMENT_SIZE;
CachedBufferFactory factory = CachedBufferFactory.create(9*pbsize + 4, true);
this.ibA = PointerBuffer.wrap(factory.newDirectByteBuffer(3*pbsize));
diff --git a/src/com/jogamp/opencl/CLMemory.java b/src/com/jogamp/opencl/CLMemory.java
index 25253803..5b0422ca 100644
--- a/src/com/jogamp/opencl/CLMemory.java
+++ b/src/com/jogamp/opencl/CLMemory.java
@@ -102,7 +102,7 @@ public abstract class CLMemory <B extends Buffer> extends CLObject implements CL
protected static long getSizeImpl(CL cl, long id) {
PointerBuffer pb = PointerBuffer.allocateDirect(1);
- int ret = cl.clGetMemObjectInfo(id, CL_MEM_SIZE, PointerBuffer.elementSize(), pb.getBuffer(), null);
+ int ret = cl.clGetMemObjectInfo(id, CL_MEM_SIZE, pb.elementSize(), pb.getBuffer(), null);
checkForError(ret, "can not obtain buffer info");
return pb.get();
}
diff --git a/src/com/jogamp/opencl/CLProgram.java b/src/com/jogamp/opencl/CLProgram.java
index bbae75d9..fd19cd8f 100644
--- a/src/com/jogamp/opencl/CLProgram.java
+++ b/src/com/jogamp/opencl/CLProgram.java
@@ -101,7 +101,7 @@ public class CLProgram extends CLObject implements CLResource {
binarySize += entry.getValue().length;
}
- int pbSize = PointerBuffer.elementSize();
+ int pbSize = PointerBuffer.ELEMENT_SIZE;
int deviceCount = binaries.size();
CachedBufferFactory bf = CachedBufferFactory.create(binarySize + pbSize*deviceCount*3 + 4, true);
@@ -600,7 +600,7 @@ public class CLProgram extends CLObject implements CLResource {
CLDevice[] devices = getCLDevices();
PointerBuffer sizes = PointerBuffer.allocateDirect(devices.length);
- int ret = cl.clGetProgramInfo(ID, CL_PROGRAM_BINARY_SIZES, sizes.capacity()*PointerBuffer.elementSize(), sizes.getBuffer(), null);
+ int ret = cl.clGetProgramInfo(ID, CL_PROGRAM_BINARY_SIZES, sizes.capacity()*sizes.elementSize(), sizes.getBuffer(), null);
if(ret != CL_SUCCESS) {
throw newException(ret, "on clGetProgramInfo(CL_PROGRAM_BINARY_SIZES) of "+this);
}
@@ -621,7 +621,7 @@ public class CLProgram extends CLObject implements CLResource {
address += sizes.get();
}
- ret = cl.clGetProgramInfo(ID, CL_PROGRAM_BINARIES, addresses.capacity()*PointerBuffer.elementSize(), addresses.getBuffer(), null);
+ ret = cl.clGetProgramInfo(ID, CL_PROGRAM_BINARIES, addresses.capacity()*addresses.elementSize(), addresses.getBuffer(), null);
if(ret != CL_SUCCESS) {
throw newException(ret, "on clGetProgramInfo(CL_PROGRAM_BINARIES) of "+this);
}