From 8a313c3240994d802af08673d095b0ec8ed69eac Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Sun, 10 Apr 2011 22:47:54 +0200 Subject: using Buffers.sizeOfBufferElem(buffer) instead of old private implementation. --- src/com/jogamp/opencl/CLMemory.java | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'src/com/jogamp/opencl/CLMemory.java') diff --git a/src/com/jogamp/opencl/CLMemory.java b/src/com/jogamp/opencl/CLMemory.java index 25253803..ebeec28e 100644 --- a/src/com/jogamp/opencl/CLMemory.java +++ b/src/com/jogamp/opencl/CLMemory.java @@ -33,11 +33,7 @@ import com.jogamp.common.nio.Buffers; import com.jogamp.common.nio.PointerBuffer; import com.jogamp.opencl.impl.CLMemObjectDestructorCallback; import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.DoubleBuffer; -import java.nio.FloatBuffer; import java.nio.IntBuffer; -import java.nio.ShortBuffer; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -73,7 +69,7 @@ public abstract class CLMemory extends CLObject implements CL } private void initElementSizes() { - this.elementSize = (buffer==null) ? 1 : sizeOfBufferElem(buffer); + this.elementSize = (buffer==null) ? 1 : Buffers.sizeOfBufferElem(buffer); this.clCapacity = (int) (size / elementSize); } @@ -85,21 +81,6 @@ public abstract class CLMemory extends CLObject implements CL || (flags & CL_MEM_USE_HOST_PTR) != 0; } - static int sizeOfBufferElem(Buffer buffer) { - if (buffer instanceof ByteBuffer) { - return Buffers.SIZEOF_BYTE; - } else if (buffer instanceof IntBuffer) { - return Buffers.SIZEOF_INT; - } else if (buffer instanceof ShortBuffer) { - return Buffers.SIZEOF_SHORT; - } else if (buffer instanceof FloatBuffer) { - return Buffers.SIZEOF_FLOAT; - } else if (buffer instanceof DoubleBuffer) { - return Buffers.SIZEOF_DOUBLE; - } - throw new RuntimeException("Unexpected buffer type " + buffer.getClass().getName()); - } - 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); -- cgit v1.2.3 From a3654a0b8a4e0c9e246aa04019bf1d5a09e7a28d Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Mon, 11 Apr 2011 15:55:37 +0200 Subject: equals of CLMemory should also check the nio buffer. --- src/com/jogamp/opencl/CLMemory.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/com/jogamp/opencl/CLMemory.java') diff --git a/src/com/jogamp/opencl/CLMemory.java b/src/com/jogamp/opencl/CLMemory.java index ebeec28e..0e4ea1d6 100644 --- a/src/com/jogamp/opencl/CLMemory.java +++ b/src/com/jogamp/opencl/CLMemory.java @@ -257,6 +257,9 @@ public abstract class CLMemory extends CLObject implements CL if (this.context != other.context && (this.context == null || !this.context.equals(other.context))) { return false; } + if (this.buffer != other.buffer && (this.buffer == null || !this.buffer.equals(other.buffer))) { + return false; + } return true; } -- cgit v1.2.3 From 6e35af2622d5f4627dfb564058d7cf313afffe0b Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Wed, 20 Apr 2011 01:39:55 +0200 Subject: reverted a3654a0b8a4e0c9e246aa04019bf1d5a09e7a28d --- src/com/jogamp/opencl/CLMemory.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/com/jogamp/opencl/CLMemory.java') diff --git a/src/com/jogamp/opencl/CLMemory.java b/src/com/jogamp/opencl/CLMemory.java index 0e4ea1d6..ebeec28e 100644 --- a/src/com/jogamp/opencl/CLMemory.java +++ b/src/com/jogamp/opencl/CLMemory.java @@ -257,9 +257,6 @@ public abstract class CLMemory extends CLObject implements CL if (this.context != other.context && (this.context == null || !this.context.equals(other.context))) { return false; } - if (this.buffer != other.buffer && (this.buffer == null || !this.buffer.equals(other.buffer))) { - return false; - } return true; } -- cgit v1.2.3